Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc38

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

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