Merge "Fix a typo and use ArraySet in VCN"

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashSet;

import java.util.List;

import java.util.Objects;

import java.util.Set;

    /**

     * Perform mobility update to attempt recovery from suspected data stalls.

     *

     * <p>If set, the gatway connection will monitor the data stall detection of the VCN network.

     * <p>If set, the gateway connection will monitor the data stall detection of the VCN network.

     * When there is a suspected data stall, the gateway connection will attempt recovery by

     * performing a mobility update on the underlying IKE session.

     */

        mExposedCapabilities = new TreeSet(exposedCapabilities);

        mRetryIntervalsMs = retryIntervalsMs;

        mMaxMtu = maxMtu;

        mGatewayOptions = Collections.unmodifiableSet(new HashSet(gatewayOptions));

        mGatewayOptions = Collections.unmodifiableSet(new ArraySet(gatewayOptions));

        mUnderlyingNetworkTemplates = new ArrayList<>(underlyingNetworkTemplates);

        if (mUnderlyingNetworkTemplates.isEmpty()) {

            mGatewayOptions = Collections.emptySet();

        } else {

            mGatewayOptions =

                    new HashSet<>(

                    new ArraySet<>(

                            PersistableBundleUtils.toList(

                                    gatewayOptionsBundle,

                                    PersistableBundleUtils.INTEGER_DESERIALIZER));