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

Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc am: ca1c5ef7 am: 60c697e7 am: e5dff62d am: 5d2b5dd4 am: 48f9add9 am: c0aceee5

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



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