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

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

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