Merge "audio: Fix default surround sound config" into main am: 1b5dab3553 am: 3a4100ec40 am: 4eae019584 am: 4491c5c06e am: cea2c900cb am: 29c30ab75e

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>