Merge "Add surround sound configuration to the AIDL Audio HAL interface." am: 9b7a21dc95 am: 7dd1177c21

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

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