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

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

Change-Id: I187b486248fdd02a982a836de3bf2b086c1ebfa6