Cherry pick cdm udc-widevine-release changes to udc-widevine-dev to be in sync with 18.3 release

Merged from go/wvgerrit/178231

Bug: 290252845
Test: WVTS tests seem to be running and passing
Change-Id: Ifff9123a73e173e835a6e89ba7c2760e1cd500fd
(cherry picked from commit 6889845d2e7e24f22c00b333335c34259b3fc96e)

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

libwvdrmengine/oemcrypto/test/GEN_api_lock_file.c

@@ -366,3 +366,6 @@ OEMCryptoResult _oecc141(const uint8_t* challenge, size_t challenge_length,
 
 // OEMCrypto_EnterTestMode defined in v18.1
 OEMCryptoResult _oecc140(void);
+
+// OEMCrypto_FactoryInstallBCCSignature defined in v18.3
+OEMCryptoResult _oecc142(const uint8_t* signature, size_t signature_length);

libwvdrmengine/oemcrypto/test/common.mk

@@ -17,7 +17,9 @@ LOCAL_SRC_FILES:= \
   oemcrypto_corpus_generator_helper.cpp \
   oemcrypto_session_tests_helper.cpp \
   oemcrypto_basic_test.cpp \
+  oemcrypto_cast_test.cpp \
   oemcrypto_decrypt_test.cpp \
+  oemcrypto_generic_crypto_test.cpp \
   oemcrypto_license_test.cpp \
   oemcrypto_provisioning_test.cpp \
   oemcrypto_usage_table_test.cpp \