am de62d9bc: am ff8bcc1d: am 2cbec492: Merge "Make sure unmatched autenticator/account-types doesn\'t crash Contacts."

* commit 'de62d9bc43a746c434da533165f5e5ad4bfd4f17':
  Make sure unmatched autenticator/account-types doesn't crash Contacts.