Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -20,9 +20,12 @@
 #include "wv_cdm_event_listener.h"
 #include "wv_metrics.pb.h"
 
+using wvutil::FileSystem;
+using wvutil::LoggingUidSetter;
+
 namespace {
 const int kCdmTimerDurationSeconds = 1;
-}
+}  // namespace
 
 namespace wvcdm {
 
@@ -574,7 +577,7 @@ void WvContentDecryptionModule::OnTimerEvent() {
     }
     if (cdms_.empty()) {
       // The following code cannot be attributed to any app uid.
-      LoggingUidSetter set_uid(UNKNOWN_UID);
+      LoggingUidSetter set_uid(wvutil::UNKNOWN_UID);
       if (CryptoSession::TryTerminate()) {
         // If CryptoSession is in a state to be terminated, try acquiring the
         // |timer_lock_| before deciding whether to disable the timer. If the