BuildEventServiceProtoUtil: set projectId in all PublishBuildToolEventStreamRequest where one is available.

RELNOTES: set projectId in all PublishBuildToolEventStreamRequest
PiperOrigin-RevId: 225858428

src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java
index 7e36e31..f398183 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java
@@ -108,6 +108,7 @@
   public PublishBuildToolEventStreamRequest bazelEvent(
       long sequenceNumber, Timestamp timestamp, Any packedEvent) {
     return publishBuildToolEventStreamRequest(
+        projectId,
         sequenceNumber,
         timestamp,
         com.google.devtools.build.v1.BuildEvent.newBuilder().setBazelEvent(packedEvent));
@@ -116,6 +117,7 @@
   public PublishBuildToolEventStreamRequest streamFinished(
       long sequenceNumber, Timestamp timestamp) {
     return publishBuildToolEventStreamRequest(
+        projectId,
         sequenceNumber,
         timestamp,
         BuildEvent.newBuilder()
@@ -125,7 +127,10 @@
 
   @VisibleForTesting
   public PublishBuildToolEventStreamRequest publishBuildToolEventStreamRequest(
-      long sequenceNumber, Timestamp timestamp, BuildEvent.Builder besEvent) {
+      @Nullable String projectId,
+      long sequenceNumber,
+      Timestamp timestamp,
+      BuildEvent.Builder besEvent) {
     PublishBuildToolEventStreamRequest.Builder builder =
         PublishBuildToolEventStreamRequest.newBuilder()
             .setOrderedBuildEvent(
@@ -136,6 +141,9 @@
     if (sequenceNumber == 1) {
       builder.addAllNotificationKeywords(getKeywords());
     }
+    if (projectId != null) {
+      builder.setProjectId(projectId);
+    }
     return builder.build();
   }
 

src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java b/src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java
index 7e089cd..d435140 100644
--- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java
@@ -168,6 +168,7 @@
         .isEqualTo(
             PublishBuildToolEventStreamRequest.newBuilder()
                 .addAllNotificationKeywords(EXPECTED_KEYWORDS)
+                .setProjectId(PROJECT_ID)
                 .setOrderedBuildEvent(
                     OrderedBuildEvent.newBuilder()
                         .setStreamId(
@@ -187,6 +188,7 @@
     assertThat(besProtocol.bazelEvent(2, secondEventTimestamp, anything))
         .isEqualTo(
             PublishBuildToolEventStreamRequest.newBuilder()
+                .setProjectId(PROJECT_ID)
                 .setOrderedBuildEvent(
                     OrderedBuildEvent.newBuilder()
                         .setStreamId(
@@ -206,6 +208,7 @@
     assertThat(besProtocol.streamFinished(3, thirdEventTimestamp))
         .isEqualTo(
             PublishBuildToolEventStreamRequest.newBuilder()
+                .setProjectId(PROJECT_ID)
                 .setOrderedBuildEvent(
                     OrderedBuildEvent.newBuilder()
                         .setStreamId(