diff --git a/api/current.txt b/api/current.txt
index f0513fdf8b39e..6afa3457f560a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -46828,7 +46828,7 @@ package android.view.autofill {
     method public void focusChanged(android.view.View, boolean);
     method public void reset();
     method public void valueChanged(android.view.View);
-    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, android.view.autofill.AutoFillValue, boolean);
+    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, boolean);
     method public void virtualValueChanged(android.view.View, int, android.view.autofill.AutoFillValue);
   }
 
diff --git a/api/system-current.txt b/api/system-current.txt
index 63626718ffd1c..ddf921efc344e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -50247,7 +50247,7 @@ package android.view.autofill {
     method public void focusChanged(android.view.View, boolean);
     method public void reset();
     method public void valueChanged(android.view.View);
-    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, android.view.autofill.AutoFillValue, boolean);
+    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, boolean);
     method public void virtualValueChanged(android.view.View, int, android.view.autofill.AutoFillValue);
   }
 
diff --git a/api/test-current.txt b/api/test-current.txt
index ffa3744f892e5..84190cb93a88e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -47141,7 +47141,7 @@ package android.view.autofill {
     method public void focusChanged(android.view.View, boolean);
     method public void reset();
     method public void valueChanged(android.view.View);
-    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, android.view.autofill.AutoFillValue, boolean);
+    method public void virtualFocusChanged(android.view.View, int, android.graphics.Rect, boolean);
     method public void virtualValueChanged(android.view.View, int, android.view.autofill.AutoFillValue);
   }
 
diff --git a/core/java/android/view/autofill/AutoFillManager.java b/core/java/android/view/autofill/AutoFillManager.java
index 6c20f07262152..58607ba51579f 100644
--- a/core/java/android/view/autofill/AutoFillManager.java
+++ b/core/java/android/view/autofill/AutoFillManager.java
@@ -90,16 +90,13 @@ public final class AutoFillManager {
      * @param parent parent view whose focus changed.
      * @param childId id identifying the virtual child inside the parent view.
      * @param bounds child boundaries, relative to the top window.
-     * @param value current value of the child; can be {@code null} when focus is lost, but must be
-     *            set when focus is gained.
      * @param gainFocus whether focus was gained or lost.
      */
-    public void virtualFocusChanged(View parent, int childId, Rect bounds,
-            @Nullable AutoFillValue value, boolean gainFocus) {
+    public void virtualFocusChanged(View parent, int childId, Rect bounds, boolean gainFocus) {
         if (mSession == null) {
             // Starts new session.
             final AutoFillId id = getAutoFillId(parent, childId);
-            startSession(id, bounds, value);
+            startSession(id, bounds, null);
             return;
         }
 
@@ -110,7 +107,7 @@ public final class AutoFillManager {
 
         // Update focus on existing session.
         final AutoFillId id = getAutoFillId(parent, childId);
-        updateSession(id, bounds, value, gainFocus ? FLAG_FOCUS_GAINED : FLAG_FOCUS_LOST);
+        updateSession(id, bounds, null, gainFocus ? FLAG_FOCUS_GAINED : FLAG_FOCUS_LOST);
     }
 
     /**