Merge "Clean up usage of CountryDetector in PhoneNumberUtils"