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

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



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