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: f1de85ab

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



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