Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9  -s ours

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I02f70f07d24d3c7f58036d4e1535020074a1d3f0