[automerger skipped] Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa
am: c5bde9bbcd
am: 18cd0f0954
am: 2637e14916
am: 5aa3dcb21d
am: ef579e29e6
-s ours
am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 757a75879f
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133
Change-Id: I404920b723d8742ad1dbf2f2e49c06e582af7fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
1992e765b6