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

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



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