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

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

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