[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b4d7ad42 -s ours...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b4d7ad42 -s ours am: b33ed959 -s ours am: 19f6f36f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5c47c2b66b9f7c3b7d94e40339a7b637bc3a98f6