Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev