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

[automerger skipped] Backport VTS fixes to previous test versions am: 8ab8f0d1 am: e974934a am: d3a4cd62 -s ours am: b1de04a2 -s ours am: 76d0c12c -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/+/2573670



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