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

* commit '29e02b117dd84492ccd4d7969affa4f84e9c6dd5':
  Remove ShortcutManager samples from nyc-dev

Change-Id: I0504c49171ae46ef590529e3656e0d9c22ff1663