Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 am: 0db1cc0601 am: 0647236cfe

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

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