Working towards
https://github.com/bazelbuild/continuous-integration/issues/1757.

Closes #19866.

Commit
https://github.com/bazelbuild/bazel/commit/553c2bc904865fa94a9e077ac34d7d7147fa928d



PiperOrigin-RevId: 574451509
Change-Id: I00bc491365a69558038293ad2035c5133da2059a

Co-authored-by: Chi Wang <chiwang@google.com>