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

am skip reason: Merged-In I5ac23f4face323c3a42d166f3117408b2955c170 with SHA-1 2aa79446ed is already in history

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

Change-Id: I9e39791bd44fd4d0f4315aa8c65a481569620a0d