Change-Id: I2842689e192a206c0d31558c8126eae1c7904598
Will get rid of ShortcutInfoCompat in a follow up cl Change-Id: I7d7d9c938635f59b216290ba28bea9d0e0721a7d