Merge "Backport VTS fixes to previous test versions" into udc-dev am: 3d35c2e7 am: ad8c146d

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



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