Merge "Merge remote-tracking branch 'aosp/upstream-main' into aosp" am: 7dc4c9792d am: 047d79edce am: 4f9c193349 am: c66e2fa10d

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

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