Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790 am: 919c4d24 am: 09fa0c9c

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



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