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

Change-Id: I4d94dd962459c8a565eb2efc7d26afe80e14786b