Merge "PhoneAccountRegistrarTest: use registrar as SYSTEM user" into main