Merge "Unify lockscreen changing logic in LockPatternUtils"