[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7af469fe -s ours am: 469ebcb2 -s ours

am skip reason: Merged-In Ia14b0bc3851f3acbf7f38b3a0b5a4b0f89978f5e with SHA-1 b04319b9 is already in history

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



Change-Id: I406f67da30ebdae6f27a7e6c4a7cc34dea78edb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>