Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd6320 am: 663f355b7a am: 9edfcbea4a

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

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