Merge "Avoid calling LockPatternUtils from LockSettingsService"