Merge "Remove usage of non-API methods in ContactsProvider." am: b3833b3c1a am: b0dc6f47c4
am: 9045c3fda8

Change-Id: Ifeb9d7603b328a9f25c733cb137a5f9b67a8e29c