[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev am: f707a9bdf6 -s ours
am: c2490f8b7c
Change-Id: I883d1e7ca84153b8aab48e2094848447e38d83c9
This commit is contained in: