Merge "Clean up usage of CountryDetector in PhoneNumberUtils"
am: 7790a36021

Change-Id: Ibeba94473ac0ed4998b70dd51b86adc53c1b37b7