Backport PhoneNumberUtils methods (1/2)

Used compat methods to handle compatibility and removed a completed TODO.

Bug: 25629359
Change-Id: Iedb6fb694657f201452c28e954d08f2a71470fa6
2 files changed