[automerger skipped] Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 am: 0db1cc0601 am: 39457c46e2 -s ours am: 04f0870c1f -s ours

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

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

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