Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am:...

Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c am: bf3e2fd9 am: 37fbb483 am: ac61b7d0 am: f9a2bcf2 am: 6824374b am: 88d743c8

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



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