[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 93c7f25b -s ours am: fed374b1 -s ours am: 2f167b73 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieba3fa20f2be8141d2d1810dc8ae48a33589edf5