Merge "Switch SystemUI from IConnectivityManager to VpnManager."