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

Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511e am: 2f2f8155 am: d07bdb19 am: 82fb8174 am: 063800db am: 2073ca0a am: 368e386b am: 5873b54a am: 2b17f7cb am: b63b683c

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



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