[automerger skipped] Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd am: 18cd0f0954 -s ours am: 2253179638 -s ours am: 2eeb21a51d -s ours

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

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

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