[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 47e661cbf3 -s ours am: 0b88dc6098 -s ours am: 16c2a3340b -s ours

am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history

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

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