[automerger skipped] Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a am: 962bd5be93 am: ff99be2e34 -s ours

am skip reason: Change-Id I2bf250ef9154a7ae86679afa566c80dfd01f1d5b with SHA-1 9d9f970ee4 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522145

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic433846b3ab5bac27814a3dfef0305e48f70a497