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

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



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