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

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

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