Merge "Verify URI permissions for notification shortcutIcon." into tm-qpr-dev am: 007f91eb am: e0e722f8 am: 0a922d88

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



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