Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev