Merge changes from topic "cuttlefish_aidl_audio-2" into main am: 03b4a983...

Merge changes from topic "cuttlefish_aidl_audio-2" into main am: 03b4a983 am: 3b1a5125 am: 73a1cc11

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



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