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

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



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