Merge "Adding AIDL version 2 of AudioControl HAL" am: 3e8d4a1e8e

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

Change-Id: I1c6e256976b7f37920f2194f8e80436b5429d287