use new setting flag to switch between current and new aggregator.

In order for the switch, add AbstractContactAggregator for
ContactAggregator and ContactAggregator2.

Bug:20055573
Change-Id: I6f27d4df8017938b226f5c6371b15ba41fd18acd
22 files changed