Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev am: 04efe9e5ff
am: 0408672bcb

* commit '0408672bcbc9a23ff2c83962ceb8399aa0dbc087':
  Test for ShortcutManager.updateShortcuts(), also