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

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

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