Merge remote-tracking branch 'aosp/upstream-main' into main am: b14b3520de am: e398bc2bf7 am: a1ccc8dd9e am: f26ff44a64

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_python/+/2673976

Change-Id: I9b28216e47bf0a52569385355e1061dc4e8a0d57
Signed-off-by: Automerger Merge Worker <[email protected]>