Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79" into oc-dr1-dev-plus-aosp
am: 7d0dcbb13d

Change-Id: Iba2cac72cecfe8d4aedc450a40c56c851194f4c4