[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: ec38a5436d -s ours am: 953b37c10b -s ours

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

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

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