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

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

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