Cherry pick 18.4 changes to udc-widevine-dev

Get the udc-widevine-dev Android branch and oemcrypto-v18 cdm branch in
sync. The commit ID for 18.4 on oemcrypto-v18 is
a2f23a2281e5e06dc2867585bdc516fa132b6396.

Merged from go/wvgerrit/190151

Bug: 290252845
Test: WVTS tests are running and passing
Change-Id: I457332e7ca70a5b5169345e1279b3eb9f18413b6

libwvdrmengine/oemcrypto/test/oemcrypto_decrypt_test.h

@@ -98,6 +98,10 @@ class OEMCryptoSessionTestsDecryptTests
  protected:
   void SetUp() override {
     OEMCryptoLicenseTestAPI16::SetUp();
+    if (wvoec::global_features.derive_key_method ==
+        wvoec::DeviceFeatures::NO_METHOD) {
+      GTEST_SKIP() << "Test for devices that can derive session keys only.";
+    }
     pattern_ = ::testing::get<0>(GetParam());
     cipher_mode_ = ::testing::get<1>(GetParam());
     decrypt_inplace_ = ::testing::get<2>(GetParam()).decrypt_inplace;