Merge changes from topic "am-a2fad34aa94a482192cdf41f97562e31" into udc-dev

* changes:
  [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-qpr-dev am: d851a2b9 -s ours am: 2410ea82 -s ours am: 23c14c53 -s ours am: a8c418d1 -s ours am: 5307ceb8 -s ours am: c75c2a04 -s ours
  [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 01a15980 -s ours am: d445a349 -s ours am: 4ef49d17 -s ours am: 4e045e55 -s ours am: 036b2e6c -s ours am: 5dddb5e7 -s ours