Merge remote-tracking branch 'aosp/upstream-master' into merge_rules_go am: 49dcd02124 am: 711a453236

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

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