Merge "Rename PhoneNumberUtils APIs" into mnc-dev