Merge "Makes testDragAppIconToMultipleWorkspaceCells more concise to avoid test timout." into main

    public void testDragAppIconToMultipleWorkspaceCells() throws Exception {

        long startTime, endTime, elapsedTime;

        Point[] targets = TestUtil.getCornersAndCenterPositions(mLauncher);

        for (Point target : targets) {

            startTime = SystemClock.uptimeMillis();

            final HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps();

            allApps.freeze();

            try {

                allApps.getAppIcon(TEST_APP_NAME).dragToWorkspace(target.x, target.y);

            } finally {

                allApps.unfreeze();

            }

            // Reset the workspace for the next shortcut creation.

        reinitializeLauncherData(true);

            endTime = SystemClock.uptimeMillis();

            elapsedTime = endTime - startTime;

            Log.d("testDragAppIconToWorkspaceCellTime",

                    "Milliseconds taken to drag app icon to workspace cell: " + elapsedTime);

        }

        // test to move a shortcut to other cell.

        final HomeAppIcon launcherTestAppIcon = createShortcutInCenterIfNotExist(TEST_APP_NAME);

        for (Point target : targets) {