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

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



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