Merge "Remove usage of non-API methods in ContactsProvider."