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

Change-Id: Ieeb9f7424d8f8e7845417f069b044e50b95c693f