Snap for 12034474 from c24bdaad26 to mainline-tzdata6-release

Change-Id: I1c4be649ccf94979230c6912464b56de0981474c

device-felix.mk

@@ -218,7 +218,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=52
+    ro.vendor.build.svn=53
 
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
@@ -382,7 +382,7 @@ PRODUCT_COPY_FILES += \
 
 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510
+    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
 
 # Bluetooth EWP test tool
 PRODUCT_PACKAGES_DEBUG += \

device_framework_matrix_product_felix.xml

@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>

vibrator/OWNERS

@@ -1,4 +1 @@
-chrispaulo@google.com
-michaelwr@google.com
-nathankulczak@google.com
-taikuo@google.com
+file:platform/hardware/google/pixel:/vibrator/OWNERS

vibrator/cs40l26/tests/Android.bp

@@ -26,7 +26,6 @@ cc_test {
         "test-vibrator.cpp",
     ],
     static_libs: [
-        "libc++fs",
         "libgmock",
     ],
     shared_libs: [