Merge "Clear Gatekeeper state before a new enrollment" into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)

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

Mon, 8 May 2017 12:03:20 +0000 (12:03 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 8 May 2017 12:03:20 +0000 (12:03 +0000)
diff --cc services/core/java/com/android/server/SyntheticPasswordManager.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 8 May 2017 12:02:45 +0000 (12:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 8 May 2017 12:03:20 +0000 (12:03 +0000)