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

Change-Id: I19b1df9a997a26d7f0ba9dbc179ae3cc31c23278