resolved conflicts for merge of 39ddeae0 to master

import android.os.Parcel;

import android.os.SystemProperties;

import android.telephony.PhoneNumberUtils;

import android.util.Log;

import com.android.internal.telephony.IccUtils;

import com.android.internal.telephony.SmsHeader;

         * mechanism, and avoid null pointer exceptions.

         */

        CdmaSmsAddress destAddr = CdmaSmsAddress.parse(destAddrStr);

        /**

         * North America Plus Code :

         * Convert + code to 011 and dial out for international SMS

         */

        CdmaSmsAddress destAddr = CdmaSmsAddress.parse(

                PhoneNumberUtils.cdmaCheckAndProcessPlusCode(destAddrStr));

        if (destAddr == null) return null;

        BearerData bearerData = new BearerData();