diff --git a/core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java b/core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
similarity index 99%
rename from core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java
rename to core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
index b10a8c8f96d2c..e38e611227865 100644
--- a/core/java/com/android/internal/inputmethod/IRemoteInputConnectionInvoker.java
+++ b/core/java/android/inputmethodservice/IRemoteInputConnectionInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.internal.inputmethod;
+package android.inputmethodservice;
 
 import android.annotation.AnyThread;
 import android.annotation.NonNull;
@@ -31,6 +31,8 @@ import android.view.inputmethod.SurroundingText;
 import android.view.inputmethod.TextAttribute;
 
 import com.android.internal.infra.AndroidFuture;
+import com.android.internal.inputmethod.IRemoteInputConnection;
+import com.android.internal.inputmethod.InputConnectionCommandHeader;
 
 import java.util.Objects;
 
@@ -38,7 +40,7 @@ import java.util.Objects;
  * A stateless wrapper of {@link com.android.internal.inputmethod.IRemoteInputConnection} to
  * encapsulate boilerplate code around {@link AndroidFuture} and {@link RemoteException}.
  */
-public final class IRemoteInputConnectionInvoker {
+final class IRemoteInputConnectionInvoker {
 
     @NonNull
     private final IRemoteInputConnection mConnection;
diff --git a/core/java/android/inputmethodservice/RemoteInputConnection.java b/core/java/android/inputmethodservice/RemoteInputConnection.java
index 26d2d9eb1063b..2711c4f0db1f5 100644
--- a/core/java/android/inputmethodservice/RemoteInputConnection.java
+++ b/core/java/android/inputmethodservice/RemoteInputConnection.java
@@ -36,7 +36,6 @@ import android.view.inputmethod.TextAttribute;
 import com.android.internal.inputmethod.CancellationGroup;
 import com.android.internal.inputmethod.CompletableFutureUtil;
 import com.android.internal.inputmethod.IRemoteInputConnection;
-import com.android.internal.inputmethod.IRemoteInputConnectionInvoker;
 import com.android.internal.inputmethod.ImeTracing;
 import com.android.internal.inputmethod.InputConnectionProtoDumper;