am ec371fd4: Merge "Contacts should not share user with ContactsProvider"

* commit 'ec371fd4bcd12f104f332be19f0ab464291e1f0e':
  Contacts should not share user with ContactsProvider