Merge "Verify URI permissions for notification shortcutIcon." into sc-qpr1-dev am: 2a8bb556 am: 46854f58 am: 3ff17ae2 am: 48e6a929 am: 44d87b12 am: 590954bc am: 29af3d20 am: 6e3bb8a7 am: 849d9a92

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



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