[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7af469fec2 -s ours am: 469ebcb250 -s ours am: e09296f64c -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: I8caae9db4802487b2f0415ab01326f6f8268d208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>