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

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