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

* commit '4a07c34ca86fddb75332eba22a4d7b9bd48205db':
  ShortcutManager: add remaining APIs.