Merge "AuthManager: do not rewrite PRIMARY_REQUIRED to REQUIRED"