am f481f22a: Handle DATA in ContactsProvider2.getType().

Merge commit 'f481f22a9323fe338672f99b88b26c5f0725cd42'

* commit 'f481f22a9323fe338672f99b88b26c5f0725cd42':
  Handle DATA in ContactsProvider2.getType().