Use simpler method of forcing tests to rerun

Author: mhsmith

Platforms/Android/android_run.py

@@ -342,7 +342,7 @@ async def gradle_task(context, app_id):
         + (".bat" if os.name == "nt" else "")
     )
     args = [
-        gradlew, "--console", "plain", f"{task_prefix}DebugAndroidTest"
+        gradlew, "--console", "plain", f"{task_prefix}DebugAndroidTest", "--rerun"
     ]
     for prop in context.gradle_properties:
         args += ["-P", prop]

Platforms/Android/testbed/app/build.gradle.kts

@@ -171,16 +171,6 @@ android {
                     systemImageSource = "aosp_atd"
                 }
             }
-
-            // If the previous test run succeeded and nothing has changed,
-            // Gradle thinks there's no need to run it again. Override that.
-            afterEvaluate {
-                (localDevices.names + listOf("connected")).forEach {
-                    tasks.named("${it}DebugAndroidTest") {
-                        outputs.upToDateWhen { false }
-                    }
-                }
-            }
         }
     }
     androidResources {