Snap for 4383207 from 58fe9fd1fe to pi-release

Change-Id: I7fe909febb47135769f80770303ccc669d4576cd

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -494,7 +494,7 @@ class WatchDog {
     pthread_mutex_lock(&mutex_);
     struct timespec time_to_giveup;
     clock_gettime(CLOCK_REALTIME, &time_to_giveup);
-    time_to_giveup.tv_sec += 5;  // wait 5 seconds.
+    time_to_giveup.tv_sec += 120;  // wait 2 minutes.
     if (running_) {
       pthread_cond_timedwait(&condition_, &mutex_, &time_to_giveup);
     }
@@ -609,6 +609,7 @@ class Adapter {
           wvcdm::metrics::OEMCrypto_INITIALIZED_FORCING_L3);
       return result;
     }
+    LOGI("L3 Initialized. Trying L1.");
     std::string library_name;
     if (!wvcdm::Properties::GetOEMCryptoPath(&library_name)) {
       LOGW("L1 library not specified. Falling back to L3");