Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc am: ca1c5ef7 am: 60c697e7 am: b040c996 am: 17846d03 am: 4a0cee97 am: 8c5330d7

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



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