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

Change-Id: I2f8bc7c7e4b16de652a5609e36746217dc8c3138