Merge "Add areLongLivedTcpConnectionsExpensive in VpnTransportInfo"