am 3b77a35b: am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit '3b77a35b1d32154f3665400407d912d5f8d656fd':
  Prevent the creation of Shorcuts with null intents (issue 5629292)