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

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

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



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