Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE] Clear properties after interaction is ended" into rvc-dev am: cdaa4f3cb0 am: d6744b0a9b
  [DO NOT MERGE] Clear properties after interaction is ended am: 1145db5d8e am: 63a3ab4e33

services/accessibility/java/com/android/server/accessibility/gestures/EventDispatcher.java

@@ -322,6 +322,12 @@ class EventDispatcher {
         return true;
     }
 
+    void clear() {
+        mLongPressingPointerId = -1;
+        mLongPressingPointerDeltaX = 0;
+        mLongPressingPointerDeltaY = 0;
+    }
+
     public void clickWithTouchEvents(MotionEvent event, MotionEvent rawEvent, int policyFlags) {
         final int pointerIndex = event.getActionIndex();
         final int pointerId = event.getPointerId(pointerIndex);

services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java

@@ -809,6 +809,7 @@ public class TouchExplorer extends BaseEventStreamTransformation
 
                 // Announce the end of a the touch interaction.
                 mAms.onTouchInteractionEnd();
+                mDispatcher.clear();
                 mDispatcher.sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END);
 
             } break;