Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 44a679e5e0 am: 75c1fd8106

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

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