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

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