[automerger skipped] Fix broken and flaky VTS tests am: d3f69217e0 -s ours am: cbfac1a6b1 -s ours am: e991a9cedf -s ours am: a536709d68 -s ours am: 6aa48d055a -s ours am: a8e6440243 -s ours am: 2c5cdf1c22 -s ours

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

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

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