Merge "Validate URI-based shortcut icon at creation time." into rvc-dev am: bdcf6b3c0f am: bf3e2fd99a am: 37fbb483b2 am: ac61b7d030 am: f9a2bcf245 am: 6824374b6b am: 88d743c868 am: 3b18ce1510

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

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