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

[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b9 -s ours am: 52922c7b -s ours

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

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



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