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

Change-Id: Ia25a60f70dd172a7c8dfe5c17e72bdf193b0d3f0