Merge "Move some VPN logic out of ConnectivityService"