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

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

Change-Id: Ib43891034ca13a3ae64bf7e07430de08fbb0ba5d