[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 87f5e5c4fc -s ours am: 217998da1d -s ours am: 02ef8fbfe5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe82bf318d8b9929d903a0d674714d4b3c28db71