Merge "Dismiss magnifier correctly in concurrent editing scenario" into sc-dev am: 7b0989f35d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344156

Change-Id: I1755980f2ff127f8a29147d656915ddc37bfc544

core/java/android/widget/Editor.java

@@ -6684,13 +6684,13 @@ public class Editor {
                     if (TextView.DEBUG_CURSOR) {
                         logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP");
                     }
+                    if (mEndHandle != null) {
+                        mEndHandle.dismissMagnifier();
+                    }
                     if (!isDragAcceleratorActive()) {
                         break;
                     }
                     updateSelection(event);
-                    if (mEndHandle != null) {
-                        mEndHandle.dismissMagnifier();
-                    }
 
                     // No longer dragging to select text, let the parent intercept events.
                     mTextView.getParent().requestDisallowInterceptTouchEvent(false);