Merge "Update LockPatternUtils for consistency"