Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main