[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev am: f707a9bdf6 -s ours am: c2490f8b7c am: c00b92c040
am: 7b43322c82 -s ours
am skip reason: subject contains skip directive
Change-Id: I88683d60884c84a73405a631e4800159efd3e904
This commit is contained in: