Merge Android 12

Bug: 202323961
Merged-In: I793b678232ad2a620eb137cb1640b89ff351f455
Change-Id: I4f5a0cc78e923323fe090c003c2fc78ec14039c2
diff --git a/device-common.mk b/device-common.mk
index caed1f1..dec2c72 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -119,7 +119,7 @@
     android.hardware.audio.service \
     android.hardware.audio@7.0-impl \
     android.hardware.audio.effect@7.0-impl \
-    android.hardware.soundtrigger@2.2-impl \
+    android.hardware.soundtrigger@2.3-impl \
     android.hardware.bluetooth.audio@2.0-impl
 
 # Build default bluetooth a2dp and usb audio HALs
diff --git a/manifest.xml b/manifest.xml
index 5f62e28..99c8500 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -92,7 +92,7 @@
    <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
         <transport>hwbinder</transport>
-        <version>2.2</version>
+        <version>2.3</version>
         <interface>
             <name>ISoundTriggerHw</name>
             <instance>default</instance>