Remove custom AndroidTest.xml

Test: atest keystore2_test
Test: Will wait for corresponding unicode-xid change
Change-Id: Ia56f1c438fab51a31d2dd0b76f68d07572cd7788
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 354a6d6..bd08bc8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -42,9 +42,8 @@
     name: "keystore2_test",
     crate_name: "keystore2",
     srcs: ["src/lib.rs"],
-    test_suites: ["device-tests"],
-    auto_gen_config: false,
-    test_config: "AndroidTest.xml",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     rustlibs: [
         "android.hardware.security.keymint-rust",
         "android.security.apc-rust",
diff --git a/keystore2/AndroidTest.xml b/keystore2/AndroidTest.xml
deleted file mode 100644
index b295947..0000000
--- a/keystore2/AndroidTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration description="Config to run keystore2_test device tests.">
-
-    <option name="test-suite-tag" value="rust-tests" />
-
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-        <option name="cleanup" value="true" />
-        <option name="push" value="keystore2_test->/data/local/tmp/keystore2_test" />
-    </target_preparer>
-
-    <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >
-        <option name="test-device-path" value="/data/local/tmp" />
-        <option name="module-name" value="keystore2_test" />
-    </test>
-</configuration>