Merge "Stop using ConnectivityManager for VPNs in DPMS."