Merge "Delete VPN methods in ConnectivityManager."