Closes #22400.

PiperOrigin-RevId: 642564375
Change-Id: I1326aa33ddd30d29a51b928adcea0def42304fe9

Commit
https://github.com/bazelbuild/bazel/commit/2758f55c1d4a11a296c0d9649880300d20ae96f9



Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>