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

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

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