[tf.data] Just replace old resample with new.

Also, add an optimization / bug fix that shortcircuits combining the two datasets if one should always be sampled from.

Tested:

bazel test :resample_test