Merge "Update VTS tests for AudioControl AIDL HAL version 2" into tm-dev am: 9378da8b4b am: 435dca6466

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

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