[automerger skipped] 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 am: 69d83198e4 -s ours am: 03e7be403f -s ours

am skip reason: Merged-In I392f8e923923bf40827a2b6207c4eaa262694fbc with SHA-1 3d41fb7620 is already in history

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

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