[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into tm-qpr-dev am: 007f91eb6c -s ours am: 2159c058c4 -s ours
am skip reason: skipped by user aioana Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083138 Change-Id: Idd76b1d16033fc413d7cccd8d97169e888ddfb6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: