[automerger skipped] Merge "Ignore some Chooser tests that flake on races." into tm-dev am: c10fc9cdd0 am: 218e267671 -s ours
am skip reason: Merged-In I113a1ba4de2176e209339a1cbbe2583cb5fe518c with SHA-1 08df009e8d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17913999
Change-Id: I80ff8a174e569b5d789cd622155026510b5b2274
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: