[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: 88d743c8 am: 3b18ce15 am: fc362d85 -s ours am: 8aacb817 -s ours

am skip reason: Merged-In I392f8e923923bf40827a2b6207c4eaa262694fbc with SHA-1 520e266b is already in history

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



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