Merge "Correct android version number in test" into qt-dev am: 48650f74ab

am: 5b3a43b17c

Change-Id: I17391063e8fa00b1315fc1cce5d9139636a1f95d

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -5522,7 +5522,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
   std::string release_number =
       android::base::GetProperty("ro.build.version.release", "");
   ASSERT_TRUE(release_number.size() > 0);
-  EXPECT_STREQ("Q", release_number.c_str())
+  EXPECT_STREQ("10", release_number.c_str())
       << "The Android version number has changed. You need to update this test "
          "and also possibly update the Widevine version number in "
          "properties_android.cpp.";