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