Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2

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

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