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

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

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