Fix a couple of merge issues in RequestTracker.pause removal.

library/src/main/java/com/bumptech/glide/manager/RequestTracker.java

@@ -43,7 +43,7 @@ public class RequestTracker {
     if (!isPaused) {
       request.begin();
     } else {
-      request.pause();
+      request.clear();
       if (Log.isLoggable(TAG, Log.VERBOSE)) {
         Log.v(TAG, "Paused, delaying request");
       }

library/test/src/test/java/com/bumptech/glide/manager/RequestTrackerTest.java

@@ -150,6 +150,15 @@ public class RequestTrackerTest {
     assertThat(request.isRunning()).isFalse();
   }
 
+  @Test
+  public void runRequest_withAllRequestsPaused_doesNotStartRequest() {
+    FakeRequest request = new FakeRequest();
+    tracker.pauseAllRequests();
+    tracker.runRequest(request);
+
+    assertThat(request.isRunning()).isFalse();
+  }
+
   @Test
   public void runRequest_afterPausingAndResuming_startsRequest() {
     FakeRequest request = new FakeRequest();
@@ -457,24 +466,6 @@ public class RequestTrackerTest {
     }
   }
 
-  @Test
-  public void runRequest_withAllRequestsPaused_pausesNewRequest() {
-    Request request = mock(Request.class);
-    tracker.pauseAllRequests();
-    tracker.runRequest(request);
-
-    verify(request).pause();
-  }
-
-  @Test
-  public void runRequest_withRequestsPaused_pausesNewRequest() {
-    Request request = mock(Request.class);
-    tracker.pauseRequests();
-    tracker.runRequest(request);
-
-    verify(request).pause();
-  }
-
   private class ClearAndRemoveRequest implements Answer<Void> {
 
     private final Request toRemove;