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

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

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