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

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

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



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