Merge changes from topic "am-6db43838d2db40668386816a1c7dc191"

* changes:
  [automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b9 -s ours am: 52922c7b -s ours am: a1e863a3 -s ours am: 099868aa -s ours am: e707b58e -s ours am: 2e13a4af -s ours am: 9f31dc6b -s ours am: 10edc4bf -s ours am: 1afa71ea -s ours
  [automerger skipped] Verify URI permissions for notification shortcutIcon. am: 39a13178 -s ours am: aee70f1c -s ours am: e88eed63 -s ours am: 1d611484 -s ours am: 8135fa99 -s ours am: 820da584 -s ours am: 62497a5f -s ours am: f96c365e -s ours am: 85d98f02 -s ours