Snap for 7233013 from 43c7ac72b3 to tm-release

Change-Id: Ife90b2921793c180f889879542ea2068a8b5ebf3

libwvdrmengine/cdm/util/test/test_clock.cpp

@@ -17,7 +17,7 @@ namespace {
 class FakeClock : public wvcdm::TestSleep::CallBack {
  public:
   FakeClock() {
-    auto now = std::chrono::steady_clock().now();
+    auto now = std::chrono::system_clock().now();
     now_ = now.time_since_epoch() / std::chrono::milliseconds(1);
     TestSleep::set_callback(this);
   }