Merge "Fix broken and flaky VTS tests" am: 2facc26b0c am: ac790352d8

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

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