Merge "Move AccountTypeManager to ContactsCommon."