Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 44a679e5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2886246



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