am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1

* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates