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