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 am: 4491c5c0 am: cea2c900 am: 29c30ab7

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



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