am 3d2be557: (-s ours) DO NOT MERGE Follow API change in PhoneNumberUtils

* commit '3d2be557ac8f1dec18e82a15d4fffd8b15c36047':
  DO NOT MERGE Follow API change in PhoneNumberUtils