grp_pwd_test: remove obsolete "trunk stable" hack.

Change-Id: Ia2d84730dea98f4263d97184040cbc4d0c113172

tests/grp_pwd_test.cpp

diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp
index 6ced378..0340ae4 100644
--- a/tests/grp_pwd_test.cpp
+++ b/tests/grp_pwd_test.cpp
@@ -447,30 +447,6 @@
     return result;
   };
 
-  // AID_UPROBESTATS (1093) was added in API level 35, but "trunk stable" means
-  // that the 2024Q* builds are tested with the _previous_ release's CTS.
-  if (android::base::GetIntProperty("ro.build.version.sdk", 0) == 34) {
-#if !defined(AID_UPROBESTATS)
-#define AID_UPROBESTATS 1093
-#endif
-    ids.erase(AID_UPROBESTATS);
-    expected_ids.erase(AID_UPROBESTATS);
-    if (getpwuid(AID_UPROBESTATS)) {
-      EXPECT_STREQ(getpwuid(AID_UPROBESTATS)->pw_name, "uprobestats");
-    }
-  }
-  // AID_VIRTUALMACHINE (3013) was added in API level 35, but "trunk stable" means
-  // that the 2024Q* builds are tested with the _previous_ release's CTS.
-  if (android::base::GetIntProperty("ro.build.version.sdk", 0) == 34) {
-#if !defined(AID_VIRTUALMACHINE)
-#define AID_VIRTUALMACHINE 3013
-#endif
-    ids.erase(AID_VIRTUALMACHINE);
-    expected_ids.erase(AID_VIRTUALMACHINE);
-    if (getpwuid(AID_VIRTUALMACHINE)) {
-      EXPECT_STREQ(getpwuid(AID_VIRTUALMACHINE)->pw_name, "virtualmachine");
-    }
-  }
   // AID_CROS_EC (1094) was added in API level 36, but "trunk stable" means
   // that the 2024Q* builds are tested with the _previous_ release's CTS.
   if (android::base::GetIntProperty("ro.build.version.sdk", 0) == 35) {