[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-dev...

[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df1 am: b928a088 -s ours

am skip reason: Merged-In I7a2e85c703d2758f89b0c06d898f9423d6764444 with SHA-1 76524da8 is already in history

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



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