[automerger skipped] Merge "Ignore some Chooser tests that flake on races."...

[automerger skipped] Merge "Ignore some Chooser tests that flake on races." into tm-dev am: c10fc9cd am: 1aea501e am: 540f1fc0 am: efc925d7 -s ours

am skip reason: Merged-In I113a1ba4de2176e209339a1cbbe2583cb5fe518c with SHA-1 08df009e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17913999



Change-Id: Ia6e04b5206642b452e175a848fa112c71614f3e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>