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

Change-Id: I0e6ba4833937f1a8bf6626313789d585f86c51da