[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: 0ef4de38 -s ours am: 5481fc6c -s ours

am skip reason: skipped by user aioana

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



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