Merge "Merge "Verify URI permissions for notification shortcutIcon." into...

Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511e am: 2f2f8155 am: d07bdb19 am: 82fb8174 am: 063800db am: 2073ca0a" into udc-dev am: c271d30b am: 63220e78 am: b6887951 am: 2c81f545

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



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