Merge "Fix bug: NullPointerException in ChooserActivity" into rvc-qpr-dev am: b0c1ac5b2e am: 201e1d41bd

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

Change-Id: I7975c2734baf99b87f82c48eacfdd8997a9b6c7f