am 57fd770: AI 148328: CTS: Fix premature end of session when disabling 

Merge commit '57fd7702a412ad10fbae061368c4cc3ea9e72f2a' into donut

* commit '57fd7702a412ad10fbae061368c4cc3ea9e72f2a':
  AI 148328: CTS: Fix premature end of session when disabling device restarts
diff --git a/tools/host/src/com/android/cts/TestSession.java b/tools/host/src/com/android/cts/TestSession.java
index 2ac840b..3a159e2 100644
--- a/tools/host/src/com/android/cts/TestSession.java
+++ b/tools/host/src/com/android/cts/TestSession.java
@@ -406,8 +406,11 @@
                             pkg.setSessionThread(this);
                             pkg.run(mDevice, null, mSessionLog);
                             if (!isAllTestsRun()) {
-                                markNeedRestartADBServer();
-                                return;
+                                if (HostConfig.getMaxTestCount() > 0) {
+                                    // ADB server restart enabled
+                                    markNeedRestartADBServer();
+                                    return;
+                                }
                             } else {
                                 Log.d("All tests have been run.");
                                 break;