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

am skip reason: subject contains skip directive

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

Change-Id: I536ca47f60cf7f0ec8b9308d0f32d42d23ef4bec