Fixing the "duplication" of contacts (manual merge from GB)

This bug was a regression caused by
CL I413231af

When the aggregator decided that it did not
need to aggregate a raw contact despite an
existing match, it would create a duplicate
contact for that raw contact.  Fortunately
those "duplicate" contacts are easy to identify
and remove.

Bug: 3091731
Change-Id: I117fdfc636cc540854b130bf0b01d0696b11e1fb
2 files changed