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

Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 44a679e5 am: 75c1fd81 am: 2eacec6b

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



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