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: 48e6a929 am: 44d87b12 am: 5813a2a0 am: c9d5ac04" into udc-d1-dev-plus-aosp am: f465793a

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



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