Merge remote-tracking branch 'aosp/upstream-main' into mymerge am: 748e62d604 am: dad1665d12 am: eb146bbc49

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_license/+/2500461

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