Merge changes Ie70977f9,I45ef3001

* changes:
  2-way cherry-pick from oc-preview-docs-release: docs: Updated ShortcutManager Javadoc for Android O Developer Preview.
  docs: Edited ShortcutManager reference docs for Android O.