Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
am: 3d5bf99e7f

Change-Id: I7649712f41a7746acd21382e651e45fecf67a0cf