[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 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: I3586e23a5a2da10ff24777b8a0c9dd360537a9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>