Merge "Make sure unmatched autenticator/account-types doesn't crash Contacts."