Merge "Stop using ConnectivityManager for VPNs." into sc-dev