Merge "sys user split: turn off unlocking for sys user."

author Xiaohui Chen <xiaohuic@google.com>

Thu, 16 Jul 2015 16:39:35 +0000 (16:39 +0000)

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

Thu, 16 Jul 2015 16:40:03 +0000 (16:40 +0000)
author Xiaohui Chen <xiaohuic@google.com>
Thu, 16 Jul 2015 16:39:35 +0000 (16:39 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 16 Jul 2015 16:40:03 +0000 (16:40 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
Simple merge
author	Xiaohui Chen <xiaohuic@google.com>
	Thu, 16 Jul 2015 16:39:35 +0000 (16:39 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 16 Jul 2015 16:40:03 +0000 (16:40 +0000)