Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 273b25cdb0 am: c7b23433f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2890734

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