Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network"

import static android.Manifest.permission.CONTROL_VPN;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;

import static android.net.RouteInfo.RTN_THROW;

import static android.net.RouteInfo.RTN_UNREACHABLE;

import static android.net.VpnManager.NOTIFICATION_CHANNEL_VPN;

                req = new NetworkRequest.Builder()

                        .clearCapabilities()

                        .addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                        .addCapability(NET_CAPABILITY_NOT_VPN)

                        .build();

            } else {

                // Basically, the request here is referring to the default request which is defined