Merge "Merge "ShortcutManager sample update:" into nyc-dev am: cb84ec875e am: 0ccaed41a3" into nyc-mr1-dev-plus-aosp