[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b4d7ad42c9 -s ours am: b33ed9594c -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: Idf5c08beff179d06ffd0d4627a10474c6feeb721