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

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



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