[automerger skipped] Fix broken and flaky VTS tests am: d5712db1 -s ours am: ebc8e823 -s ours

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

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



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