Merge changes from topic "revert-2862771-cuttlefish_aidl_audio-2-TFSIHPUCWV"...

Merge changes from topic "revert-2862771-cuttlefish_aidl_audio-2-TFSIHPUCWV" into main am: be26d020 am: 1ae4c24b am: f155ba56

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



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