Merge "Add a null check for a rare error case." into udc-qpr-dev am: 37440a296b am: a2f30526f1

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

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