Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev

            int digit = Character.digit(c, 10);

            if (digit != -1) {

                sb.append(digit);

            } else if (i == 0 && c == '+') {

            } else if (sb.length() == 0 && c == '+') {

                sb.append(c);

            } else if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {

                return normalizeNumber(PhoneNumberUtils.convertKeypadLettersToDigits(phoneNumber));