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

Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d