Merge "Fix conditional in AccountTypeProvider" into ub-contactsdialer-i-dev
am: 3ad22a17ff

Change-Id: I9e004f550b83791cc9ba568ebcb879f7d2bb6f8f