Merge "Merge "Verify URI permissions for notification shortcutIcon." into...

Merge "Merge "Verify URI permissions for notification shortcutIcon." into sc-dev am: 10ce511e am: 2f2f8155 am: d07bdb19 am: 82fb8174 am: 063800db am: 2073ca0a" into tm-qpr-dev-plus-aosp am: f9fa2639 am: b02cfc41 am: d23d327f am: 8314f4c6

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



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