Merge "Add watch dog timer to OEMCrypto L3" into oc-mr1-dev am: ec9e1343ee

am: dc403e611b

Change-Id: I29b13f556e107e166b5d1bf1c7adb9f38ad6a2f8

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -502,6 +502,9 @@ class WatchDog {
       gave_up_ = true;
       status_ = OEMCrypto_ERROR_INIT_FAILED;
       LOGE("XXX WATCH DOG ERROR XXX");
+      // HACK: this normally just returns an error.  However, we are using it
+      // as a signal to dump debugging information.
+      Level3_GetOEMPublicCertificate(0, nullptr, nullptr);
       SaveFailureInformation();
       // This tells the worker thread to clean up after itself. It is not
       // really needed since we are going to abort.  However, if somebody