Merge "Update Widevine integration test to match android version" into oc-dev am: ba346a1bea

am: 658dbe1dc7

Change-Id: I23316e905af3e618d1e5d266e83051eef8ba6cb8

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -3621,7 +3621,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
   char release_number[PROPERTY_VALUE_MAX];
   ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
             0);
-  EXPECT_STREQ("O", release_number)
+  EXPECT_STREQ("8.0.0", release_number)
       << "The Android version number has changed. You need to update this test "
          "and also possibly update the Widevine version number in "
          "properties_android.cpp.";