Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am:...

Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am: b2af0473 am: 6a72c2ef am: ebbf314c

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



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