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

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

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