[automerger skipped] Merge "Fix broken and flaky VTS tests" am: 2facc26b am:...

[automerger skipped] Merge "Fix broken and flaky VTS tests" am: 2facc26b am: ac790352 am: 68479d12 -s ours am: 7a72a039 -s ours am: 82c5b220 -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/+/2569373



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