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

Change-Id: Ib356eea48d2d41b379ba74302e31a14594bbff49