Merge "fix(magnification): swipe up gesture in app does not work sometimes...

Merge "fix(magnification): swipe up gesture in app does not work sometimes when fullscreen magnification activated" into udc-qpr-dev

services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java

@@ -177,7 +177,8 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH
                         }
 
                         if (!activated) {
-                            clearAndTransitionToStateDetecting();
+                            // cancel the magnification shortcut
+                            mDetectingState.setShortcutTriggered(false);
                         }
                     }