Automatic merge from submit-queue (batch tested with PRs 40798, 40658)

genericapiserver: cut off more dependencies – episode 4

Follow-up of kubernetes/kubernetes#40426.

TODO:
- [x] resync client-go before "genericapiserver: cutting off pkg/api deps" when #40426 went in and mirror repos are synched.

approved based on #40363

Kubernetes-commit: 056728067d762d7a7a673b2039f90529e68b78f9