Merge remote-tracking branch 'aosp/upstream-main' into main am: 755aefef35 am: d7bf0d569f am: 59148a708a am: 13ca54997b

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

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