Merge "Fixed View.notifyEnterOrExitForAutoFillIfNeeded()"
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 2af2467..2d85a58 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7272,7 +7272,7 @@
                         // becomes true where it should issue notifyViewEntered().
                         afm.notifyViewEntered(this);
                     }
-                } else if (!isFocused()) {
+                } else if (!enter && !isFocused()) {
                     afm.notifyViewExited(this);
                 }
             }