Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff56 am: 933e626c am: 06bd2b0c

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



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