Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev

                + " mcc:" + mcc + " mnc:" + mnc + " countIso:" + countryIso);

        }

        String line1Number = mTelephonyManager.getLine1NumberForSubscriber(id);

        if (!TextUtils.isEmpty(line1Number) && !line1Number.equals(number)) {

            logd("Line1Number is different: " + line1Number);

            number = line1Number;

        }

        return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName,

                nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso);

    }