Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd

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

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