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

Merge "[conflict] Merge "Verify URI permissions for notification shortcutIcon." into udc-dev am: fbbf6f75" into udc-dev-plus-aosp am: ad09b83d am: 4fb985d6

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



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