Merge "Detect scenario where international call dialed on WFC." am: cbaf73836e
am: 6e426ebf31

Change-Id: I7366469dcc8dedb48e44225e0f156e2d21c2801f