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: e81ac136a7

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

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