Merge "Verify URI permissions for notification shortcutIcon." into sc-v2-dev...

Merge "Verify URI permissions for notification shortcutIcon." into sc-v2-dev am: 6fcae7d9 am: 961627b8 am: 2d41f841 am: 6c462d45 am: 121e9845 am: d381d535 am: 309b6518 am: 36050dab

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



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