Merge "Update Default AudioControl AIDL HAL for version 2" into tm-dev am: 65a25dd9cc am: 55f87a7aec

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

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