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

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

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