Cherry-pick: Area code gets eaten in Chips

Bug 8436028

New code for tokenizing an address stripped the area code from a manually
entered phone number. When chips is in "phone number" mode, call a new
function (essentially the old function before the change) to create
a fake entry directly from the phone number.

Cherry-pick of: I2d62ff24aacd8eadb9086840bd4d003cf39db177

Change-Id: I08d98c2e358fc1b8a70bacf358497a511fd71069