Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd63 am: 663f355b

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



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