[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 27a9b76aa2 -s ours am: dc3d294533 -s ours

am skip reason: Change-Id I62dd37dbbe959f869225f57dda0504fd31546e53 with SHA-1 c2510cab63 is in history

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

Change-Id: Ib4dac23a5dfb7973344dcd31cd578522d5416b9a