[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev am: f707a9bdf6 -s ours am: c2490f8b7c
am: 297cdb5ad9

Change-Id: I62385ad3392847d2d5d0e7bf75d97ca4c14c4944