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

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

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