Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790 am: 5a608544 am: 6225af9e

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



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