Merge "Switch Settings from IConnectivityManager to VpnManager."