Merge changes I1c34f135,I6bd02407

* changes:
  Fix get accessibility settings for wrong user
  Split AccessibilityManagerService.UserState into its own class