diff --git a/Android.bp b/Android.bp
index 292b5255..ecce4676 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,7 @@ license {
     license_kinds: [
         "SPDX-license-identifier-Apache-2.0",
         "legacy_by_exception_only", // by exception only
+        "legacy_proprietary", // by exception only
     ],
     // large-scale-change unable to identify any license_text files
 }
diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp
index 1cb3d02c..62fe8bba 100644
--- a/libwvdrmengine/Android.bp
+++ b/libwvdrmengine/Android.bp
@@ -51,6 +51,7 @@ package {
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/cdm/Android.bp b/libwvdrmengine/cdm/Android.bp
index dae4e43e..a6b97996 100644
--- a/libwvdrmengine/cdm/Android.bp
+++ b/libwvdrmengine/cdm/Android.bp
@@ -11,6 +11,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/cdm/core/src/Android.bp b/libwvdrmengine/cdm/core/src/Android.bp
index 5b6afc36..5ff3a719 100644
--- a/libwvdrmengine/cdm/core/src/Android.bp
+++ b/libwvdrmengine/cdm/core/src/Android.bp
@@ -8,6 +8,7 @@ package {
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/cdm/core/test/Android.bp b/libwvdrmengine/cdm/core/test/Android.bp
index c170be40..97f23cab 100644
--- a/libwvdrmengine/cdm/core/test/Android.bp
+++ b/libwvdrmengine/cdm/core/test/Android.bp
@@ -22,6 +22,7 @@ package {
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/cdm/metrics/src/Android.bp b/libwvdrmengine/cdm/metrics/src/Android.bp
index 5c01872a..68dc9511 100644
--- a/libwvdrmengine/cdm/metrics/src/Android.bp
+++ b/libwvdrmengine/cdm/metrics/src/Android.bp
@@ -22,6 +22,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/level3/Android.bp b/libwvdrmengine/level3/Android.bp
index 49a179d1..8d4875fc 100644
--- a/libwvdrmengine/level3/Android.bp
+++ b/libwvdrmengine/level3/Android.bp
@@ -21,6 +21,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp
index c66eb004..bd315a2b 100644
--- a/libwvdrmengine/mediacrypto/Android.bp
+++ b/libwvdrmengine/mediacrypto/Android.bp
@@ -19,6 +19,7 @@
 package {
     // See: http://go/android-license-faq
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index 5baaf873..48511a61 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -102,8 +102,8 @@ LOCAL_C_INCLUDES += \
   external/protobuf/src \
 
 LOCAL_MODULE := libwvdrmmediacrypto_hal_test
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 
 LOCAL_MODULE_TAGS := tests
 
diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp
index 5552dede..b67f7243 100644
--- a/libwvdrmengine/mediadrm/Android.bp
+++ b/libwvdrmengine/mediadrm/Android.bp
@@ -19,6 +19,7 @@
 package {
     // See: http://go/android-license-faq
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index c6db1acb..1eaa74ff 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -102,8 +102,8 @@ LOCAL_C_INCLUDES += \
   external/protobuf/src \
 
 LOCAL_MODULE := libwvdrmdrmplugin_hal_test
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 
 LOCAL_MODULE_TAGS := tests
 
@@ -205,8 +205,8 @@ LOCAL_C_INCLUDES += \
 endif
 
 LOCAL_MODULE := hal_metrics_adapter_unittest
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 
 LOCAL_MODULE_TAGS := tests
 
diff --git a/libwvdrmengine/oemcrypto/odk/Android.bp b/libwvdrmengine/oemcrypto/odk/Android.bp
index 3b7d807a..127d0d92 100644
--- a/libwvdrmengine/oemcrypto/odk/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/Android.bp
@@ -14,6 +14,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp b/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
index 3b8fe6d6..f3512177 100644
--- a/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/test/fuzzing/Android.bp
@@ -11,6 +11,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp b/libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
index 78519cb0..0a0c0ae7 100644
--- a/libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/test/fuzzing/corpus_generator/Android.bp
@@ -18,6 +18,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk
index 5d86cda5..dcabc246 100644
--- a/libwvdrmengine/oemcrypto/test/Android.mk
+++ b/libwvdrmengine/oemcrypto/test/Android.mk
@@ -6,8 +6,8 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/cdm/util/include \
 
 LOCAL_MODULE:=oemcrypto_test
-LOCAL_LICENSE_KINDS:=legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS:=by_exception_only
+LOCAL_LICENSE_KINDS:=legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS:=by_exception_only proprietary by_exception_only
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_MODULE_OWNER := widevine
diff --git a/libwvdrmengine/test/castv2/Android.mk b/libwvdrmengine/test/castv2/Android.mk
index 210b548a..52c1f1bc 100644
--- a/libwvdrmengine/test/castv2/Android.mk
+++ b/libwvdrmengine/test/castv2/Android.mk
@@ -13,8 +13,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_LIBRARIES := com.android.mediadrm.signer org.apache.http.legacy
 
 LOCAL_PACKAGE_NAME := CastSignAPITest
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Disable dexpreopt and <uses-library> check for test.
diff --git a/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
index d2b98dc5..c6597d9d 100644
--- a/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
+++ b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := MediaDrmAPITest
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 
 LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
 
diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk
index 639e2922..124ea7ac 100644
--- a/libwvdrmengine/test/unit/Android.mk
+++ b/libwvdrmengine/test/unit/Android.mk
@@ -80,8 +80,8 @@ endif
 
 LOCAL_MODULE := libwvdrmengine_hal_test
 
-LOCAL_LICENSE_KINDS := legacy_by_exception_only
-LOCAL_LICENSE_CONDITIONS := by_exception_only
+LOCAL_LICENSE_KINDS := legacy_by_exception_only legacy_proprietary
+LOCAL_LICENSE_CONDITIONS := by_exception_only proprietary by_exception_only
 
 LOCAL_MODULE_TAGS := tests
 
diff --git a/libwvdrmengine/tools/factory_upload_tool/Android.bp b/libwvdrmengine/tools/factory_upload_tool/Android.bp
index 62ba6160..95e6c01f 100644
--- a/libwvdrmengine/tools/factory_upload_tool/Android.bp
+++ b/libwvdrmengine/tools/factory_upload_tool/Android.bp
@@ -5,6 +5,7 @@ package {
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/tools/metrics_dump/Android.bp b/libwvdrmengine/tools/metrics_dump/Android.bp
index 9dbdb221..29856ab7 100644
--- a/libwvdrmengine/tools/metrics_dump/Android.bp
+++ b/libwvdrmengine/tools/metrics_dump/Android.bp
@@ -21,6 +21,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
diff --git a/libwvdrmengine/vts/vendor_module/Android.bp b/libwvdrmengine/vts/vendor_module/Android.bp
index 9610dfe6..f592845d 100644
--- a/libwvdrmengine/vts/vendor_module/Android.bp
+++ b/libwvdrmengine/vts/vendor_module/Android.bp
@@ -26,6 +26,7 @@ package {
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }