Merge latest oemcrypto-v17 change

No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/core/src/license_protocol.proto

@@ -117,6 +117,17 @@ message ProxyInfo {
 
 message License {
   message Policy {
+    // Client-side watermarking restrictions for the license.
+    enum WatermarkingControl {
+      // Watermarking may or may not be used, provider does not care.
+      WATERMARKING_CONTROL_UNSPECIFIED = 0;
+      // Watermarking must not be used. The device must disable watermarking
+      // if it supports it.
+      WATERMARKING_FORBIDDEN = 1;
+      // Watermarking is required if the device supports it.
+      WATERMARKING_REQUIRED = 2;
+    }
+
     // Indicates that playback of the content is allowed.
     optional bool can_play = 1 [default = false];
 
@@ -182,6 +193,10 @@ message License {
     // soft_enforce_playback_duration must be true. Otherwise, subsequent
     // playbacks will not be allowed once rental duration expires. Optional.
     optional bool soft_enforce_rental_duration = 15 [default = true];
+
+    // Optional requirement to indicate watermarking is allowed.
+    optional WatermarkingControl watermarking_control = 16
+        [default = WATERMARKING_CONTROL_UNSPECIFIED];
   }
 
   message KeyContainer {
@@ -644,6 +659,7 @@ message ProvisioningRequest {
   message AndroidAttestationOtaKeyboxRequest {
     // The request contains custom serialized and signed data for the
     // Android Attestation OTA request.
+    // see: go/wv_android_ota
     optional bytes ota_request = 1;
   }