Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a am: 0df906d279" into oc-mr1-dev-plus-aosp
am: cff0fad96c

Change-Id: I08c3da5917c9035390235845280982d3df9d4cb1