Merge "Fix plus sign of country code prefixes can't show on CDMA MO call"
am: 728cae1d28

Change-Id: I4b32c1365f10cb0c3a08d6147b1904d7ee27c559