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

Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-qpr1-dev am: 2a8bb556 am: 46854f58 am: 3ff17ae2 am: 3f4cfdde am: 331b875c" into udc-dev-plus-aosp am: c860ad07 am: f91bfc20

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



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