Merge "Fix broken and flaky VTS tests" into udc-dev am: a4ed84bab9

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

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