Merge "Close session before terminate"

libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp

@@ -5495,10 +5495,13 @@ TEST_F(UsageTableTest, TimingTest) {
 
   sleep(kLongSleep);
   // This is as close to reboot as we can simulate in code.
+  ASSERT_NO_FATAL_FAILURE(session_.close());  // Close sessions before terminate.
   OEMCrypto_Terminate();
   sleep(kShortSleep);
   OEMCrypto_Initialize();
   EnsureTestKeys();
+  // Test teardown expects session_ to be open.
+  ASSERT_NO_FATAL_FAILURE(session_.open());
 
   // After a reboot, we should be able to reload keys, and generate reports.
   sleep(kLongSleep);