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

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

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