Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 5f50cd6320

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889786

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