Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff5608 am: 933e626ce7

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

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