47633f8627
Removes all dashes if locale isn't NANP or Japan and the number
don't have there country code.
Use case: If adding a number starting with 1nnnnnn and then
trying to add a country code before (ex +46) we will first
trigger NANP formatting with +1-nnn-nnn so when we get
+41-nnn-nnn we will still have the old NANP formatting.
This number should be shown as +461nnnnnn.
Change-Id: I5cab830350d785a58367eba79e268d9e8ee16aac