Merge "Fix conditional in AccountTypeProvider" into ub-contactsdialer-i-dev