Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790ac am: 919c4d24c4 am: c2b55f31d2

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

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