Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev am: fee89015c5
am: 873d2f4404

Change-Id: I81aa4ee6ee8c920409bffd7ae2b812ac09ff2b79