Merge "Verify URI permissions for notification shortcutIcon." into sc-qpr1-dev am: 2a8bb5568a am: 46854f586b am: 3ff17ae251

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

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