Merge "Use ContactsContract.PhoneLookup to look up SIP addresses." into ics-mr1