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