[automerger skipped] Merge changes from topic "audio-hal-7" am: aa2e608a am:...

[automerger skipped] Merge changes from topic "audio-hal-7" am: aa2e608a am: b04f29c9 am: 226b8e65 -s ours

am skip reason: Change-Id I0e5a15d65974421443c00d4f0edaf0514a71673f with SHA-1 8f262df7 is in history

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

Change-Id: I6e192404527172d75665465d51aba0df09629cd6