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

* commit 'ffc51ec6261aef3532cca09777c9441a032a6e3e':
  Remove ShortcutManager samples from nyc-dev

Change-Id: I77d0dfb3641bf1a72c80a4241adb1de1e764b8bd