Fixing the "duplication" of contacts

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: Ifef2c212c1ec8d431a0aa2eeb6f34f9e30345194
2 files changed