Merge "Replace PhoneLookupSelector with PhoneLookupInfoConsolidator."
am: b68ae2c635

Change-Id: I199ef1ce151d049ba3c206effaec36022c5f2fea