Closes https://github.com/bazelbuild/bazel/pull/19887.

Commit
https://github.com/bazelbuild/bazel/commit/29985cd45fb843338b312fe0b286553b178fc4c9



PiperOrigin-RevId: 574598871
Change-Id: I961aee0329ca00a01bceddbf69b33ff396e013d5

---------

Co-authored-by: Tony Aiuto <aiuto@google.com>