Merge "Rename Cp2PhoneLookup as Cp2LocalPhoneLookup and...
Merge "Rename Cp2PhoneLookup as Cp2LocalPhoneLookup and PhoneLookupInfo.cp2_info as PhoneLookupInfo.cp2_local_info." am: c2450479
am: 0c97f9ba
Change-Id: Ibe49b67ecc46544aba06ae81bcc7b1bc2c4c258d