Merge "audio: Make IConfig.getSurroundSound default implementation more robust" into main am: 58d953e4be am: cc476475f8

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

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