Merge "[automerger skipped] Verify URI permissions for notification...

Merge "[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 2f66b7da -s ours am: 732a3ed7 -s ours am: ec0649bb -s ours am: 40b17344 -s ours am: 12740324 -s ours am: f5103791 -s ours am: bff272cc -s ours" into udc-dev am: 934d9f99 -s ours

am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a15980 is already in history

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



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