Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev