Merge \"Start shortcuts as if publisher apps did using PendingIntent\" into nyc-mr1-dev
am: 60efbf2586

Change-Id: If43a09cd1580edb318404f56459b8557b69b7d5a