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

[automerger skipped] Merge "Fix NPE when fetch shortcut icon uri" into udc-qpr-dev am: a2cb2231 am: 344e90ae -s ours

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

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



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