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