[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 93c7f25b9f -s ours

am skip reason: Change-Id I9cd544292abc85430a234bede371e4f4010848b6 with SHA-1 27a9b76aa2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9848b8d675fde411a1243e94ff64abca0de9a368