Merge "Merge "audio: Bring default HAL configuration closer to cuttlefish" am:...

Merge "Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb" into stage-aosp-master am: 08add363 am: abca9588

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



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