Merge "Verify URI permissions for notification shortcutIcon." into sc-v2-dev am: 6fcae7d9 am: 961627b8 am: 561733fb am: 4b8d1674 am: 6a0f7520 am: 366c062d

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



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