Merge "Handling timeout in PeopleApiPhoneLookup & Cp2ExtendedDirectoryPhoneLookup" am: 87300f1c76
am: 7c2dfc9356

Change-Id: I884d13bd2777014669db619520a5442f36dafc4f