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

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

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



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