Merge changes from topic "am-2d13404b9a8a479c81611159319362cf"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Revert "Verify URI permissions for notification shortcutIcon."" into rvc-dev am: d402a8dd -s ours am: 7e10a4e6 -s ours am: c2d4e9d8 -s ours am: 52cac04f -s ours am: 7c01c091 -s ours am: 54ed8788 -s ours am: 5ba562ee -s ours am: ba122162 -s ours am: 2e423533 -s ours am: 1dc1a655 -s ours am: 0310c67d -s ours am: b401eeab -s ours
  [automerger skipped] DO NOT MERGE am: a31fad61 -s ours am: e17cff53 -s ours am: 1e97b93b -s ours am: 4389f50f -s ours am: a48caa92 -s ours am: df0ca773 -s ours am: b67a78e0 -s ours am: d2046a7b -s ours am: d3430768 -s ours am: 5c08f154 -s ours am: 68640595 -s ours am: 0ece2eb7 -s ours