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: I3abb6fa07931ddc8e47ee01d8ec0e87966913063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>