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

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



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