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

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

Change-Id: I2658ba55254a9016dbe4503aa3cc44a40f24b804