[automerger skipped] Merge "Fix broken and flaky VTS tests" into...

[automerger skipped] Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87b am: c5bde9bb am: 18cd0f09 am: 2637e149 am: 5aa3dcb2 am: ef579e29 -s ours

am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 757a7587 is already in history

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



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