[automerger skipped] Merge "Fix(?) for some disabled ChooserActivityTest...

[automerger skipped] Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am: b2af0473 am: 6a72c2ef am: 3c6705a3 -s ours am: 9a800f93 -s ours

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

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



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