Snap for 7864539 from 542f1ede9ddac71d3b60f5e7317387e587e7e138 to android11-tests-release

Change-Id: I69417f88091e32912d83f42ac0def0c200d39bb2
diff --git a/test/cts/device_feature_test_cts.cc b/test/cts/device_feature_test_cts.cc
index 3ed5bc1..6ed16c3 100644
--- a/test/cts/device_feature_test_cts.cc
+++ b/test/cts/device_feature_test_cts.cc
@@ -21,9 +21,9 @@
 namespace perfetto {
 
 TEST(PerfettoDeviceFeatureTest, TestMaxCpusForAtraceChmod) {
-  // Check that there are no more than 16 CPUs so that the assumption in the
+  // Check that there are no more than 24 CPUs so that the assumption in the
   // atrace.rc for clearing CPU buffers is valid.
-  ASSERT_LE(sysconf(_SC_NPROCESSORS_CONF), 16);
+  ASSERT_LE(sysconf(_SC_NPROCESSORS_CONF), 24);
 }
 
 }  // namespace perfetto