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

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

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