[automerger skipped] Merge "Adding AIDL version 2 of AudioControl HAL" am:...

[automerger skipped] Merge "Adding AIDL version 2 of AudioControl HAL" am: 3e8d4a1e am: f7d14cbe am: 4338f844 am: 240dab92 -s ours

am skip reason: Merged-In If74d575fad3888b698250a8ec9a6918f7cb294d7 with SHA-1 5d7af1e9 is already in history

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

Change-Id: Icf23bf0832274038ef5bf4f4018f99faf0f294a9