[automerger skipped] Merge "Update Default AudioControl AIDL HAL for version...

[automerger skipped] Merge "Update Default AudioControl AIDL HAL for version 2" into tm-dev am: 65a25dd9 am: 750b9e88 -s ours

am skip reason: Merged-In I6be9620feb19d766d43be7199be2e9cd6d63c644 with SHA-1 625a8984 is already in history

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



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