Merge "Remove ShortcutManager samples from nyc-dev" into nyc-dev am: 29e02b117d am: ffc51ec626  -s ours
am: 79db6186ae

* commit '79db6186ae4381e3d823b5705aaa9addb026fb84':
  Remove ShortcutManager samples from nyc-dev

Change-Id: I932eeb82ade452ef2db75e9145cfc11bf4d693f5