Merge remote-tracking branch 'aosp/upstream-main' into aosp am: fb2b420b89

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-kotlin-rules/+/2795413

Change-Id: I3ebefa424fd41bb0a472a2e55fee10e4aaf03efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>