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

[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b9 -s ours am: 2410ea82 -s ours am: 23c14c53 -s ours am: a8c418d1 -s ours am: 5307ceb8 -s ours am: 7e06b4b8 -s ours

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

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



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