Backport VTS fixes to previous test versions am: 8ab8f0d1d8 am: e974934a46

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

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