Defensive check added to FormatInOriginalFormat (#2294)
Defensive check added to FormatInOriginalFormat (#2294)

* Defensive check added to FormatInOriginalFormat

Add a check that the FG is indeed in the national prefix before erasing it, in FormatInOriginalFormat. Matches java interpretation. It should always be there but if for some reason someone generates metadata with it not there we don't want to seg fault.

* Update phonenumberutil.cc

google/libphonenumber,google/libphonenumber,google/libphonenumber,google/libphonenumber,google/libphonenumber,google/libphonenumber