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

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



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