Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
am: 027fd0ae95

* commit '027fd0ae9512b57ec13448d292609ad41ebd0bb6':
  ShortcutManager: add remaining APIs.