Merge "Refactor CarrierPrivilegeAuthenticatorTest"