Merge "Trying to fix flaky TAPL test on CF" into tm-qpr-dev am: 7c8ee4f8de

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19886864

Change-Id: I06694418da1b2d7c13fa5976b5780c2c7807ceca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/tapl/com/android/launcher3/tapl/Workspace.java

@@ -475,7 +475,9 @@ public final class Workspace extends Home {
             // Since the destination can be on another page, we need to drag to the edge first
             // until we reach the target page
             while (targetDest.x > displayX || targetDest.x < 0) {
-                int edgeX = targetDest.x > 0 ? displayX : 0;
+                // Don't drag all the way to the edge to prevent touch events from getting out of
+                //screen bounds.
+                int edgeX = targetDest.x > 0 ? displayX - 1 : 1;
                 Point screenEdge = new Point(edgeX, targetDest.y);
                 Point finalDragStart = dragStart;
                 executeAndWaitForPageScroll(launcher,