cheets_CTS_P: Sync the test list for DEV version.

Removing entries from this list within the same version tag
confuses the CPCon canonical test list. As a workaround,
we revive back all the tests that were in the list in the past.

We can clean them up at the timing when the DEV version increments
its version number (quarterly).

BUG=b:151779432
TEST=cheets_CTS_P.9.0_dev.arm.waivers

Change-Id: Ia5a573a01f9b1fa5e532b7eb771688c6da6cf04d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2109354
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/site_tests/cheets_CTS_P/subplans/waivers.xml b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
index 6864f0f..f7e9fb3 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -1,5 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no' ?>
 <SubPlan version="2.0">
+  <!--
+    Unless there's special reason, the entries can be removed only
+    when the DEV version bundle's provisional version number (like 9.0r13)
+    is incremented. Otherwise the computation for the canonical list
+    of test cases is confused. See b/151779432.
+  -->
+  <Entry include="CtsBionicTestCases pthread_leak#detach" />
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testBasicDrawFrame"/>
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame"/>
   <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame"/>
@@ -7,4 +14,9 @@
   <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLContextTest#test_SSLContext_x509AndPskConfiguration_defaultProviderOnly"/>
   <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketTest#test_SSLSocket_ClientHello_cipherSuites"/>
   <Entry include="CtsLibcoreTestCases org.apache.harmony.tests.javax.net.ssl.SSLSessionTest#test_getCipherSuite"/>
+  <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducer" />
+  <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducerCopyToRGBA16F" />
+  <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducer" />
+  <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducerCopyToRGBA16F" />
+  <Entry include="CtsViewTestCases android.view.cts.ViewTest#testTouchMode" />
 </SubPlan>