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

Change-Id: Ic127ceb09609b793e9515400d1be06818d2df43d