Merge "Enhance the shortcut manager javadoc." into oc-dev
am: aeb7505a7f

Change-Id: Iefc3efbdc1fc8ffbe1953a24686fc94e7f67da5d