Merge "Kibosh the NrState Strings"

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.AccessNetworkConstants.TransportType;

                .append(" cellIdentity=").append(mCellIdentity)

                .append(" voiceSpecificInfo=").append(mVoiceSpecificInfo)

                .append(" dataSpecificInfo=").append(mDataSpecificInfo)

                .append(" nrState=").append(nrStateToString(mNrState))

                .append(" nrState=").append(Build.IS_DEBUGGABLE

                        ? nrStateToString(mNrState) : "****")

                .append(" rRplmn=").append(mRplmn)

                .append(" isUsingCarrierAggregation=").append(mIsUsingCarrierAggregation)

                .append("}").toString();

                    .append(", isUsingCarrierAggregation=").append(isUsingCarrierAggregation())

                    .append(", mLteEarfcnRsrpBoost=").append(mLteEarfcnRsrpBoost)

                    .append(", mNetworkRegistrationInfos=").append(mNetworkRegistrationInfos)

                    .append(", mNrFrequencyRange=").append(mNrFrequencyRange)

                    .append(", mNrFrequencyRange=").append(Build.IS_DEBUGGABLE

                            ? mNrFrequencyRange : FREQUENCY_RANGE_UNKNOWN)

                    .append(", mOperatorAlphaLongRaw=").append(mOperatorAlphaLongRaw)

                    .append(", mOperatorAlphaShortRaw=").append(mOperatorAlphaShortRaw)

                    .append(", mIsDataRoamingFromRegistration=")