[automerger skipped] Fix broken and flaky VTS tests am: d3f69217 -s ours am:...

[automerger skipped] Fix broken and flaky VTS tests am: d3f69217 -s ours am: 6b5472fa -s ours am: c8c4ad31 -s ours

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

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



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