Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev
am: d642148c84

Change-Id: Iabb204baf3772b44b6852ec9d7135db0baf228bc