Merge "Verify URI permissions for notification shortcutIcon." into sc-v2-dev am: 6fcae7d9 am: 961627b8

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



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