Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
Change-Id: I46b3d8fe6840571221df2479591cf7800382c8a1

device.mk

@@ -932,7 +932,7 @@ include hardware/google/pixel/citadel/citadel.mk
 -include hardware/google/pixel/mm/device_legacy.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # Pixel Logger
 include hardware/google/pixel/PixelLogger/PixelLogger.mk

device_framework_matrix_product.xml

@@ -42,7 +42,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>2</version>
+        <version>2-3</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>
@@ -212,7 +212,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>

usb/usb/Android.bp

@@ -38,7 +38,7 @@ cc_binary {
         "android.hardware.usb.gadget@1.0",
         "android.hardware.usb-V1-ndk",
         "libcutils",
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
         "libbinder_ndk",
 
@@ -48,7 +48,7 @@ cc_binary {
         "libpixelstats",
     ],
     export_shared_lib_headers: [
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
     ],
 }