[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1051a3edb9 -s ours am: bcd7412ae9 -s ours am: 019101e1c7 -s ours am: ff7ee3bd51 -s ours

am skip reason: Merged-In I73faf2fdc96ed47d3ab85855155ac7bd25925776 with SHA-1 02ef8fbfe5 is already in history

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

Change-Id: I191372807419cd85227d943aed5ac23d2a597440