[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc38 am: db037e20ea -s ours

am skip reason: skipped by user aioana

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

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