Backport VTS fixes to previous test versions am: 8ab8f0d1d8

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

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