Merge "Add @RedactionType annotations to VpnTransportInfo."

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.net.NetworkCapabilities.RedactionType;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

    public final String sessionId;

    @Override

    public long getApplicableRedactions() {

    public @RedactionType long getApplicableRedactions() {

        return REDACT_FOR_NETWORK_SETTINGS;

    }

     * Create a copy of a {@link VpnTransportInfo} with the sessionId redacted if necessary.

     */

    @NonNull

    public VpnTransportInfo makeCopy(long redactions) {

    public VpnTransportInfo makeCopy(@RedactionType long redactions) {

        return new VpnTransportInfo(type,

            ((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : sessionId);

    }