[automerger skipped] audio: Fix default surround sound config am: 222e2a6c...

[automerger skipped] audio: Fix default surround sound config am: 222e2a6c -s ours am: e42432a0 -s ours

am skip reason: Merged-In I3a46ea5ee4805f719c8977064c9d8d681a75cff2 with SHA-1 724b24f8 is already in history

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



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