Merge remote-tracking branch 'aosp/upstream-master' into merge_rules_go am: 49dcd02124 am: 711a453236 am: 6cf433ad1b am: de80525bba am: 96939a977e

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

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