Merge "Fix ChooserActivity crash when launched with a caller-provided target" into tm-qpr-dev am: 5526eb113f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20621336

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