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