DO NOT MERGE: Bump CTS and CTS-V version to 12.1_R4

Bug: 238402645
Change-Id: Iac08019ca1a79e2db20e8dc8553d1c4ecaf6bcdd
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index ae62afb..a6fdf61 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.cts.verifier"
           android:versionCode="5"
-          android:versionName="12.1_r3">
+          android:versionName="12.1_r4">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31"/>
 
diff --git a/tools/cts-tradefed/Android.bp b/tools/cts-tradefed/Android.bp
index 907e848..2a17141 100644
--- a/tools/cts-tradefed/Android.bp
+++ b/tools/cts-tradefed/Android.bp
@@ -34,7 +34,7 @@
     wrapper: "etc/cts-tradefed",
     short_name: "CTS",
     full_name: "Compatibility Test Suite",
-    version: "12.1_r3",
+    version: "12.1_r4",
     static_libs: ["cts-tradefed-harness"],
     required: ["compatibility-host-util"],
 }