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

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

Change-Id: I6e3d25d70fdcd2e7083199eb7b1a59d35bc41de2