[automerger skipped] Backport VTS fixes to previous test versions am:...

[automerger skipped] Backport VTS fixes to previous test versions am: 526a3a29 am: 64816a99 am: 0aae7ccc am: 0db1cc06 am: 0647236c am: 36bc4c8f -s ours am: bf9527ee -s ours

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

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



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