Default contact aggregator to ContactAggregator2.

New aggregator has been tested via gservice flag.
Now we make it default regardless of the gservice flag.

Bug:22355413
Change-Id: Iff9464dfc7bdd6342eafecc22e052786edd37acd
1 file changed