[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: 36b663d8 am: 8dc4fdc1 -s ours am: c8c41bfa -s ours

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

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



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