Merge "Address leftover comments of ag/18108411"

            super(TAG);

            mProfile = profile;

            mIpSecManager = (IpSecManager) mContext.getSystemService(Context.IPSEC_SERVICE);

            // Pass mExecutor into Ikev2VpnNetworkCallback and make sure that IkeV2VpnRunnerCallback

            // will be called by the mExecutor thread.

            mNetworkCallback = new VpnIkev2Utils.Ikev2VpnNetworkCallback(TAG, this, mExecutor);

            mSessionKey = UUID.randomUUID().toString();

        }

import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executor;

/**

 * Utility class to build and convert IKEv2/IPsec parameters.

    static class Ikev2VpnNetworkCallback extends NetworkCallback {

        private final String mTag;

        private final Vpn.IkeV2VpnRunnerCallback mCallback;

        private final ExecutorService mExecutor;

        private final Executor mExecutor;

        Ikev2VpnNetworkCallback(String tag, Vpn.IkeV2VpnRunnerCallback callback,

                ExecutorService executor) {

                Executor executor) {

            mTag = tag;

            mCallback = callback;

            mExecutor = executor;