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

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

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



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