[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours

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

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

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