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

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

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