[automerger skipped] Fix broken and flaky VTS tests am: d5712db152
-s ours am: 675bcd53a4
-s ours am: 156743d5d3
-s ours
am skip reason: Merged-In Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6 with SHA-1 d3f69217e0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24796584
Change-Id: I09ddd47275f121d71d42af772f8029282da6a718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
a32fb24706