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

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

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