Automatic merge from submit-queue (batch tested with PRs 38049, 37823, 38000, 36646)

Revert "test: update rollover test to wait for available rs before adopting"

This reverts commit 5b7bf78f from pr #36439 which appears to have mostly broken the gci-gke test.