[automerger skipped] Merge "Verify URI permissions for notification...

[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-qpr-dev am: 007f91eb -s ours am: 2159c058 -s ours am: 21a8bbf7 -s ours

am skip reason: skipped by user aioana

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



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