Test for ShortcutManager.updateShortcuts(), also

... fix bugs

Bug 27548047

Change-Id: Ia55d35521912dcba2fb1bb9c20588a83d1a2d004
3 files changed