Merge "Replace PhoneLookupSelector with PhoneLookupInfoConsolidator." am: b68ae2c635
am: dd0c29a84d

Change-Id: I6cd8167ed4930bbc629fea88a1b8969d6eb9a40f