diff --git a/api/current.txt b/api/current.txt
index 153cf69e15469..4bb9c81637891 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6515,6 +6515,7 @@ package android.app {
     method public void dropShellPermissionIdentity();
     method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
     method public android.os.ParcelFileDescriptor executeShellCommand(String);
+    method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String);
     method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
     method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
     method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
diff --git a/api/test-current.txt b/api/test-current.txt
index 25a471086409a..d2ceb191000ce 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -539,7 +539,6 @@ package android.app {
 
   public final class UiAutomation {
     method public void destroy();
-    method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String);
     method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRwe(@NonNull String);
     method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle);
     method @Deprecated public boolean revokeRuntimePermission(String, String, android.os.UserHandle);
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index 4e868fe7370b0..1b0fd9edf4f8f 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -1242,10 +1242,8 @@ public final class UiAutomation {
      *
      * @param command The command to execute.
      * @return File descriptors (out, in) to the standard output/input streams.
-     *
-     * @hide
      */
-    @TestApi
+    @SuppressLint("ArrayReturn") // For consistency with other APIs
     public @NonNull ParcelFileDescriptor[] executeShellCommandRw(@NonNull String command) {
         return executeShellCommandInternal(command, false /* includeStderr */);
     }
diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt
index 2bdf1a58e751c..59a5f664285dc 100644
--- a/non-updatable-api/current.txt
+++ b/non-updatable-api/current.txt
@@ -6515,6 +6515,7 @@ package android.app {
     method public void dropShellPermissionIdentity();
     method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
     method public android.os.ParcelFileDescriptor executeShellCommand(String);
+    method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String);
     method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
     method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
     method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();