Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df1

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



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