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

[automerger skipped] Merge "Update VTS tests for AudioControl AIDL HAL version 2" into tm-dev am: 9378da8b am: 435dca64 am: 0e8540fc -s ours

am skip reason: Merged-In Iea05f7bfcc102ccd5d79b2f29c3fbf179044e537 with SHA-1 b22e1d6f is already in history

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



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