Merge "[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-qpr-dev am: 007f91eb -s ours am: 2159c058 -s ours am: 21a8bbf7 -s ours am: bdf0904c -s ours" into udc-qpr-dev-plus-aosp am: cd2c64b7

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



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