Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."

core/java/android/view/View.java

@@ -3808,6 +3808,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
                 imm.focusOut(this);
             }
             removeLongPressCallback();
+            removeTapCallback();
             onFocusLost();
         } else if (imm != null && (mPrivateFlags & FOCUSED) != 0) {
             imm.focusIn(this);