[automerger skipped] Fix broken and flaky VTS tests am: d5712db152 -s ours am: ebc8e823b7 -s ours am: 240ba7b9c5 -s ours am: 93675b1523 -s ours

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

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

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