Merge change 23461 into eclair

* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider