[conflict] Merge "Verify URI permissions for notification shortcutIcon." into...

[conflict] Merge "Verify URI permissions for notification shortcutIcon." into udc-dev am: fbbf6f75

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



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