[automerger skipped] Merge changes from topic "libaudiohal_audiohalversion"...

[automerger skipped] Merge changes from topic "libaudiohal_audiohalversion" am: c9c108d3 am: b4bfaa46 am: a09dc794 -s ours

am skip reason: Merged-In I1d51a94fe75a5d0b99bf388f7bcc96ce8bee33e7 with SHA-1 2b8fed44 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2336113



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