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

* commit '04efe9e5ff56ff6c4db6fe7eb4c35acb5b6f61ac':
  Test for ShortcutManager.updateShortcuts(), also