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

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

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