Revert "Add bedstead dependency"

This reverts commit fba1cf2dc25b3f244b30f12d1e95cabcb9019602.

Reason for revert: Broke https://atp.googleplex.com/test-runs?testName=v2%2Faaos-engprod%2Fconcurrent_multi_session_ime_test&offset=0&buildTarget=cf_x86_64_only_auto_md-trunk_staging-userdebug

Change-Id: I82a3a7b9bcc5dc0bd5f60cfa5bbd276eeee48071
Bug: 327704045

2 files changed, 2 insertions, 13 deletions

diff --git a/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp b/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp
index 0e0d212efcf1..8d05a974dc40 100644
--- a/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp
+++ b/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp
@@ -26,11 +26,6 @@ android_test {
         "platform-test-annotations",
         "platform-test-rules",
         "truth",
-
-        // beadstead
-        "Nene",
-        "Harrier",
-        "TestApp",
     ],
     test_suites: [
         "general-tests",
diff --git a/tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTest.java b/tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTest.java
index 867c0a6e8a02..b66ceba458ac 100644
--- a/tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTest.java
+++ b/tests/inputmethod/ConcurrentMultiSessionImeTest/src/com/android/server/inputmethod/multisessiontest/ConcurrentMultiUserTest.java
@@ -23,20 +23,14 @@ import android.content.pm.PackageManager;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.android.bedstead.harrier.BedsteadJUnit4;
-import com.android.bedstead.harrier.DeviceState;
-
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
-@RunWith(BedsteadJUnit4.class)
+@RunWith(JUnit4.class)
 public final class ConcurrentMultiUserTest {
 
-    @Rule
-    public static final DeviceState sDeviceState = new DeviceState();
-
     @Before
     public void doBeforeEachTest() {
         // No op