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

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

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