am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using...
am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev
* commit '7788b759':
Fix deadlock in LockPatternUtils by using local id.