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: 09fa0c9c am: fc4f86da

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



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