[automerger skipped] Merge "Fix plus sign of country code prefixes can't show on CDMA MO call" am: 728cae1d28 am: cd83815e23
am: ed96834c9a  -s ours

Change-Id: Ia7a497fc49de03346b44f46291e225c48c2cbdac