Merge "Use User ID 10 for second user in PhoneAccountRegistrarTest." into main