Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511ed9 am: 2f2f8155b2 am: d07bdb1979 am: 82fb81741a

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

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