Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790ac

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

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