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

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

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



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