Merge "Update longLivedTcpConnectionsExpensive value in VpnTransportInfo"