Merge "[automerger skipped] Verify URI permissions for notification shortcutIcon. am: 2f66b7da2a -s ours am: 732a3ed7af -s ours am: ec0649bb30 -s ours am: 40b173447d -s ours am: 12740324e6 -s ours am: f51037914f -s ours am: bff272cc23 -s ours" into udc-dev