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

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

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