Merge "Makes the multi-touch prevention only works for editable TextView." into rvc-qpr-dev am: b72c8a096b

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

Change-Id: Ie3f9e6e8e00f4a647dc6f9d317763601cdc26adb

core/java/android/widget/TextView.java

@@ -11009,12 +11009,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     MotionEvent.actionToString(event.getActionMasked()),
                     event.getX(), event.getY());
         }
-        if (!isFromPrimePointer(event, false)) {
-            return true;
-        }
-
         final int action = event.getActionMasked();
         if (mEditor != null) {
+            if (!isFromPrimePointer(event, false)) {
+                return true;
+            }
+
             mEditor.onTouchEvent(event);
 
             if (mEditor.mInsertionPointCursorController != null