Change bootconfig VTS requirement

Don't require Android S launching devices to use bootconfig, even if the
functionality is available in some of the kernels that can be used.
Because we allowed Android S devices to launch with kernel version 4.19,
we need to continue supporting Android S devices that don't have
bootconfig support in the Android platform.
Android T is the first level that we only allow launching kernels 5.10+, so we
can expect all of them to use bootconfig.

This change allows Android S devices that launched with 4.19 upgrade
their kernels without needing to meet this new requirement.

Test: atest VtsBootconfigTest
Bug: 321122900
(cherry picked from https://android-review.googlesource.com/q/commit:4e49222faae1b4433c70afdd11a802aaa32c7550)
Merged-In: I540e38fd3f5c41d5f18011c14e3a7a2e42d57110
Change-Id: I540e38fd3f5c41d5f18011c14e3a7a2e42d57110
diff --git a/vts/VtsBootconfigTest.cpp b/vts/VtsBootconfigTest.cpp
index 285c180..3e655f0 100644
--- a/vts/VtsBootconfigTest.cpp
+++ b/vts/VtsBootconfigTest.cpp
@@ -22,11 +22,12 @@
 class VtsBootconfigTest : public testing::Test {};
 
 TEST_F(VtsBootconfigTest, ProcCmdlineAndroidbootTest) {
-  // This test only applies to devices launching with S(or greater) AND with
-  // kernel version 5.10(or greater)
-  bool kernel_support = android::bpf::isAtLeastKernelVersion(5, 10, 0);
-  if (std::stoi(android::base::GetProperty("ro.product.first_api_level", "0"))
-    < __ANDROID_API_S__ || !kernel_support) {
+  // This was supported in Android S with kernel version 5.10+, but really only
+  // required by Android T because Android still needs to support
+  // Android S devices that launched with 4.19 for as long as it supports
+  // Android S.
+  if (android::base::GetIntProperty("ro.vendor.api_level", 0)
+      < __ANDROID_API_T__) {
     GTEST_SKIP() << "Bootconfig requirements do not apply";
   }