am d9760ee2: Merge "Deduping shortcuts to app-shortcuts if they have a valid intent" into ub-launcher3-burnaby

* commit 'd9760ee2de0a245fe0a0c11891723ef3f1513de9':
  Deduping shortcuts to app-shortcuts if they have a valid intent