Merge "Simplify some code in KeyStore2ParameterUtils#addUserAuthArgs" into main