Fix wrong documentation and add missing annotations

#minor-release

PiperOrigin-RevId: 552749407
(cherry picked from commit ed071ab21136f438c9a7fd05093de4107d014cc5)

library/core/src/main/java/com/google/android/exoplayer2/upstream/CmcdConfiguration.java

@@ -289,7 +289,7 @@ public final class CmcdConfiguration {
   }
   }
 
 
   /**
   /**
-   * Returns whether logging object duration is allowed based on the {@linkplain RequestConfig
+   * Returns whether logging measured throughput is allowed based on the {@linkplain RequestConfig
    * request configuration}.
    * request configuration}.
    */
    */
   public boolean isMeasuredThroughputLoggingAllowed() {
   public boolean isMeasuredThroughputLoggingAllowed() {

library/core/src/main/java/com/google/android/exoplayer2/upstream/CmcdLog.java

@@ -446,8 +446,8 @@ public final class CmcdLog {
     public static final class Builder {
     public static final class Builder {
       @Nullable private String contentId;
       @Nullable private String contentId;
       @Nullable private String sessionId;
       @Nullable private String sessionId;
-      @Nullable private String streamingFormat;
-      @Nullable private String streamType;
+      @Nullable private @StreamingFormat String streamingFormat;
+      @Nullable private @StreamType String streamType;
       @Nullable private String customData;
       @Nullable private String customData;
 
 
       /**
       /**
@@ -530,13 +530,13 @@ public final class CmcdLog {
      * (HLS), s = Smooth Streaming and o = other. If the streaming format being requested is
      * (HLS), s = Smooth Streaming and o = other. If the streaming format being requested is
      * unknown, then this key MUST NOT be used.
      * unknown, then this key MUST NOT be used.
      */
      */
-    @Nullable public final String streamingFormat;
+    @Nullable public final @StreamingFormat String streamingFormat;
 
 
     /**
     /**
      * Type of stream. v = all segments are available – e.g., VOD and l = segments become available
      * Type of stream. v = all segments are available – e.g., VOD and l = segments become available
      * over time – e.g., LIVE.
      * over time – e.g., LIVE.
      */
      */
-    @Nullable public final String streamType;
+    @Nullable public final @StreamType String streamType;
 
 
     /**
     /**
      * Custom data where the values of the keys are expected to be invariant over the life of the
      * Custom data where the values of the keys are expected to be invariant over the life of the