Merge "Verify URI permissions for notification shortcutIcon." into sc-v2-dev am: 6fcae7d9e0 am: 961627b8ae am: 2d41f841b8 am: 6c462d4566 am: 121e984576
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23083140 Change-Id: I4d40c62537530236a65eb0d6d00419278da34d2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: