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

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

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