Merge "Correct accessibility check for current user"

author Phil Weaver <pweaver@google.com>

Wed, 1 Feb 2017 20:16:59 +0000 (20:16 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 1 Feb 2017 20:17:03 +0000 (20:17 +0000)
author Phil Weaver <pweaver@google.com>
Wed, 1 Feb 2017 20:16:59 +0000 (20:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 1 Feb 2017 20:17:03 +0000 (20:17 +0000)
diff --cc services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
Simple merge
author	Phil Weaver <pweaver@google.com>
	Wed, 1 Feb 2017 20:16:59 +0000 (20:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 1 Feb 2017 20:17:03 +0000 (20:17 +0000)