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

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

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