[automerger skipped] Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am: b2af0473 am: ea996d70 -s ours

am skip reason: Merged-In I5268e3324d3cec9f6a72aee5de9ec1f06e45e987 with SHA-1 72b8b079 is already in history

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



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