Correct logic to re-compute dependencies after absorbing a $sort into query layer

SERVER-39109 inadvertently thwarted an optimization to re-compute the set of fields needed for the aggregation. Instead of re-computing the dependencies in such a scenario, it will get confused because the $cursor stage has already been added and mistakenly report that all fields are needed for the aggregation. We should restore the optimization.