Merge "audio: Update hardwired configuration" am: cd0609de am: 8d5d162c...

Merge "audio: Update hardwired configuration" am: cd0609de am: 8d5d162c am: 787cf627 am: 5777253d am: 3ed5d2a7

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



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