[automerger skipped] Merge "Validate URI-based shortcut icon at creation...

[automerger skipped] 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: e81ac136 am: 69d83198 -s ours

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

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



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