Merge "audio: Fix default surround sound config" into main am: 1b5dab35 am:...

Merge "audio: Fix default surround sound config" into main am: 1b5dab35 am: 3a4100ec am: 4eae0195

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



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