Merge "Fix ExternalAccountTypeTests" into ub-contactsdialer-h-dev am: be7158495f
am: c0066d32c0

Change-Id: I07ea0eb240e49895f98f37b0892ab83a84d780d4