Merge pull request #23657 from ericgribkoff/backport_new_xds_tests

Backport new xds tests