Merge "Revert "Revert "Delete VPN methods in ConnectivityManager."""