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

Change-Id: Ide8a223f128b506943f238f865af86d0a7ca85e8