am 8f5e89e8: am f024f336: Merge "Rename PhoneNumberUtils APIs" into mnc-dev

* commit '8f5e89e88aee25785fd9f7017a843d5587e0963e':
  Rename PhoneNumberUtils APIs