[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set." into pi-dev
am: f707a9bdf6 -s ours
am skip reason: subject contains skip directive

Change-Id: I36856c3a199e44a27af692e98f1e04c790d5c5b9