Merge cherrypicks of [6795681, 6795720] into qt-release

import android.telephony.NeighboringCellInfo;

import android.telephony.PhoneNumberUtils;

import android.telephony.RadioAccessFamily;

import android.telephony.Rlog;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import java.util.List;

public class RadioResponse extends IRadioResponse.Stub {

    private static final String TAG = RadioResponse.class.getSimpleName();

    // The number of the required config values for broadcast SMS stored in the C struct

    // RIL_CDMA_BroadcastServiceInfo

    private static final int CDMA_BSI_NO_OF_INTS_STRUCT = 3;

     */

    public void getDeviceIdentityResponse(RadioResponseInfo responseInfo, String imei,

                                          String imeisv, String esn, String meid) {

        responseStrings(responseInfo, Rlog.pii(TAG, imei), imeisv, esn, meid);

        responseStrings(responseInfo, imei, imeisv, esn, meid);

    }

    /**