Merge "Refactor LockSettingsService to unify the handling of pattern and password"