[automerger skipped] Merge "Merge Android 12" am: d2d37213cd -s ours am: 69902c2b9a -s ours am: cf5fa4be49 -s ours

am skip reason: Merged-In I1f60cd434a6cda1c1039dd05f3690d9dcc65f7e2 with SHA-1 ea1b825f58 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/audio/+/1847607

Change-Id: Ieebce417f428687431fe976e2c0be5bd4e54e456