[automerger skipped] Backport VTS fixes to previous test versions am: 526a3a29 am: 64816a99 am: 0aae7ccc -s ours

am skip reason: Merged-In I77e0706f413ce9defb174f00ee145dcc01f5d780 with SHA-1 8ab8f0d1 is already in history

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



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