[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 27203f54ed -s ours am: d03640798f -s ours

am skip reason: Change-Id Ia14f19fe48e2dcdd68ea530eba0aa85e6c2162ff with SHA-1 318258f2c3 is in history

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

Change-Id: I4229d7b84fb25269cc0cc1aca437fead55e10883