Making aggregation exceptions override the not-from-same-account rule

We now have a rule that we won't let contacts
from the same account to get aggregated.  This
rule should NOT apply to manual aggregation.

Bug: 3095300
Change-Id: Idb6bdf54214cec46c72bf681e6f980ac0d293386
1 file changed