[automerger skipped] Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 -s ours am: aeaab2252e -s ours am: bdad915fdb -s ours

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

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

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