Backport VTS fixes to previous test versions am: 526a3a297b

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

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