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

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

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



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