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

Change-Id: I552ffb2acf09e5aee67c22a4f2d3fec3188f25d9