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

[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc am: db037e20 -s ours am: aba8cb79 -s ours am: 2cdd00c4 -s ours am: 1072cf88 -s ours am: c2caa447 -s ours

am skip reason: skipped by user aioana

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



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