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

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



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