Snap for 7718391 from 9278c909d3 to tm-release

Change-Id: I3a946a0fa7936580fab81510b638603d19705f8d

libwvdrmengine/cdm/util/test/test_clock.cpp

@@ -35,6 +35,7 @@ FakeClock* g_fake_clock = nullptr;
 
 // On devices running a fake OEMCrypto, we can use a fake sleep and fake time.
 int64_t Clock::GetCurrentTime() {
+  wvcdm::TestSleep::SyncFakeClock();
   if (g_fake_clock == nullptr) g_fake_clock = new FakeClock();
   return g_fake_clock->now() / 1000;
 }