Fix flaky tests that use vtcombo#16178

GuptaManan100 merged 2 commits intovitessio:mainvitessio/vitess:mainfrom

planetscale:flaky-test-vtcomboplanetscale/vitess:flaky-test-vtcomboCopy head branch name to clipboard