[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for...

[automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd -s ours am: 7e10a4e6 -s ours am: c2d4e9d8 -s ours

am skip reason: subject contains skip directive

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



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