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