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

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

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