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

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



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