diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index 89612fe753df1..99e439ae0fb1b 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -47,7 +47,6 @@ import com.android.internal.view.IInputMethod;
 import com.android.internal.view.IInputMethodSession;
 import com.android.internal.view.IInputSessionCallback;
 import com.android.internal.view.InlineSuggestionsRequestInfo;
-import com.android.internal.view.InputConnectionWrapper;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -86,7 +85,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
 
     /**
      * This is not {@null} only between {@link #bindInput(InputBinding)} and {@link #unbindInput()}
-     * so that {@link InputConnectionWrapper} can query if {@link #unbindInput()} has already been
+     * so that {@link RemoteInputConnection} can query if {@link #unbindInput()} has already been
      * called or not, mainly to avoid unnecessary blocking operations.
      *
      * <p>This field must be set and cleared only from the binder thread(s), where the system
@@ -192,7 +191,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
                 final CancellationGroup cancellationGroup = (CancellationGroup) args.arg4;
                 SomeArgs moreArgs = (SomeArgs) args.arg5;
                 final InputConnection ic = inputContext != null
-                        ? new InputConnectionWrapper(
+                        ? new RemoteInputConnection(
                                 mTarget, inputContext, moreArgs.argi3, cancellationGroup)
                         : null;
                 info.makeCompatible(mTargetSdkVersion);
@@ -302,7 +301,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
         mCancellationGroup = new CancellationGroup();
         // This IInputContext is guaranteed to implement all the methods.
         final int missingMethodFlags = 0;
-        InputConnection ic = new InputConnectionWrapper(mTarget,
+        InputConnection ic = new RemoteInputConnection(mTarget,
                 IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags,
                 mCancellationGroup);
         InputBinding nu = new InputBinding(ic, binding);
diff --git a/core/java/com/android/internal/view/InputConnectionWrapper.java b/core/java/android/inputmethodservice/RemoteInputConnection.java
similarity index 97%
rename from core/java/com/android/internal/view/InputConnectionWrapper.java
rename to core/java/android/inputmethodservice/RemoteInputConnection.java
index 0f366f183e6cf..9ab8ab66c9649 100644
--- a/core/java/com/android/internal/view/InputConnectionWrapper.java
+++ b/core/java/android/inputmethodservice/RemoteInputConnection.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.internal.view;
+package android.inputmethodservice;
 
 import android.annotation.AnyThread;
 import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.inputmethodservice.AbstractInputMethodService;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.imetracing.ImeTracing;
@@ -40,11 +39,13 @@ import android.view.inputmethod.SurroundingText;
 import com.android.internal.inputmethod.CancellationGroup;
 import com.android.internal.inputmethod.Completable;
 import com.android.internal.inputmethod.IInputContextInvoker;
+import com.android.internal.view.IInputContext;
+import com.android.internal.view.IInputMethod;
 
 import java.lang.ref.WeakReference;
 
-public class InputConnectionWrapper implements InputConnection {
-    private static final String TAG = "InputConnectionWrapper";
+final class RemoteInputConnection implements InputConnection {
+    private static final String TAG = "RemoteInputConnection";
 
     private static final int MAX_WAIT_TIME_MILLIS = 2000;
 
@@ -66,7 +67,7 @@ public class InputConnectionWrapper implements InputConnection {
     @NonNull
     private final CancellationGroup mCancellationGroup;
 
-    public InputConnectionWrapper(
+    RemoteInputConnection(
             @NonNull WeakReference<AbstractInputMethodService> inputMethodService,
             IInputContext inputContext, @MissingMethodFlags int missingMethods,
             @NonNull CancellationGroup cancellationGroup) {
@@ -424,7 +425,7 @@ public class InputConnectionWrapper implements InputConnection {
     @AnyThread
     @Override
     public String toString() {
-        return "InputConnectionWrapper{idHash=#"
+        return "RemoteInputConnection{idHash=#"
                 + Integer.toHexString(System.identityHashCode(this))
                 + " mMissingMethods="
                 + InputConnectionInspector.getMissingMethodFlagsAsString(mMissingMethods) + "}";