[automerger skipped] Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd am: 18cd0f0954 am: 2637e14916 am: 5aa3dcb21d am: ef579e29e6 -s ours am: 1992e765b6 -s ours

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

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

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