Merge "audio: Update hardwired configuration" am: cd0609de1e am: 8d5d162c75 am: 787cf6274b

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

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