Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/system/libhidl into HEAD

Android 15.0.0 Release 6 (AP4A.241205.013)

Change-Id: Iab1296f7b0121614c59a0d54751c098705228666

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IsswAKCRDorT+BmrEO
# eNNoAJ4/Lhu7FvB0b5stf5maeUopZ7HEhwCfd3MNhJuUbSCnNEfs6ZWGk1WR4xk=
# =dKw8
# -----END PGP SIGNATURE-----
# gpg: Signature faite le jeu 05 déc 2024 17:44:03 EST
# gpg:                avec la clef DSA 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Impossible de vérifier la signature : Pas de clef publique
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 3de7b74..c353960 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -29,8 +29,6 @@
         "libutils",
         "libprocessgroup",
         "libjsoncpp",
-        "libcgrouprc",
-        "libcgrouprc_format",
         "libfmq",
     ],
     target: {
diff --git a/vintfdata/frozen/202404.xml b/vintfdata/frozen/202404.xml
index fa5e3ac..91d537a 100644
--- a/vintfdata/frozen/202404.xml
+++ b/vintfdata/frozen/202404.xml
@@ -1,5 +1,9 @@
 <compatibility-matrix version="8.0" type="device">
-    <hal format="aidl" optional="false">
+    <!--
+         cameraserver is installed for all phones and tablets, but not
+         auto, TV, or Wear.
+    -->
+    <hal format="aidl" optional="true">
         <name>android.frameworks.cameraservice.service</name>
         <version>2</version>
         <interface>
@@ -30,7 +34,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="false">
+    <!--
+          vibrator is installed for all form factors except TV
+    -->
+    <hal format="aidl" optional="true">
         <name>android.frameworks.vibrator</name>
         <interface>
             <name>IVibratorControlService</name>