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: I199990fce0430a90bdf0ecff3ff061c8a6bfccb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>