Merge "Deprecate old LockPatternUtils.clearLock()"