[automerger skipped] Merge "ChooserSelector shouldn't crash w/o...

[automerger skipped] Merge "ChooserSelector shouldn't crash w/o IntentResolver" into stage-aosp-master am: 41e436ff -s ours am: 6466e3b1 -s ours

am skip reason: Merged-In I2a6b49c6fb39a730759c182f8b8245b1ccc813c9 with SHA-1 a9b92f9c is already in history

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



Change-Id: I149ac45f9221a8616d89693ec79afd71fb5b18fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>