Fix issues with Contacts sync.

We were wrapping cursors on Contacts queries too aggressively - the only cases
we should be wrapping with a snippetizing cursor are when the query actually
contains a snippet column.

Bug: 4382294
Bug: 4378350
Change-Id: I0bd007afde0bb850e88f5953f5efcfddbda0e2e4
1 file changed