[automerger skipped] Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 am: 0db1cc0601 am: 0647236cfe am: 36bc4c8fc2 -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: I9f097513058d568678241e20e3248b60910d4926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>