Merge "Merge "audio: Bring default HAL configuration closer to cuttlefish" am: b55e63fb51" into stage-aosp-master