No longer keep track of contacts affinity (2/4)

Test: atest android.provider.cts.contacts
Test: atest ContactsProviderTests ContactsProviderTests2
Change-Id: I10e66441a9766947c7c14ae25022deadac5a9c7c
Bug: 111210683
2 files changed