Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ief7c19248fdd739e17c54335a3c234aa9dd3677e
Change-Id: I36f73b0c83e658d43cdfbf62219703ab28d988b3

Android.bp

diff --git a/Android.bp b/Android.bp
index c9ec63f..24d4d99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -195,7 +195,7 @@
     ],
 
     shared_libs: [
-        "android.hardware.graphics.composer3-V3-ndk",
+        "android.hardware.graphics.composer3-V4-ndk",
         "libbase",
         "libbinder_ndk",
         "liblog",

hwc3/hwc3-drm.xml

diff --git a/hwc3/hwc3-drm.xml b/hwc3/hwc3-drm.xml
index 911f7f8..7debcf9 100644
--- a/hwc3/hwc3-drm.xml
+++ b/hwc3/hwc3-drm.xml
@@ -1,7 +1,7 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.graphics.composer3</name>
-        <version>3</version>
+        <version>4</version>
         <interface>
             <name>IComposer</name>
             <instance>default</instance>