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

* commit '5b93a5e61669b891ef07468f9527e549e6fcda59':

Change-Id: Iddbeea1253dd4c6d4092d8a915307132f44d81bd