Cleanup dumpstate for CTS tests

Change-Id: Iefd7f2863b1a2d8974d0cd1c27b1d3b2d3ffbe8e
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 13099dc..243c4a5 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -928,7 +928,7 @@
                     + " mLayoutNeeded=" + mLayoutNeeded);
 
         pw.println();
-        pw.println("  Application tokens in top down Z order:");
+        pw.println(prefix + "Application tokens in top down Z order:");
         for (int stackNdx = mTaskStackContainers.size() - 1; stackNdx >= 0; --stackNdx) {
             final TaskStack stack = mTaskStackContainers.get(stackNdx);
             stack.dump(prefix + "  ", pw);
@@ -947,11 +947,11 @@
             }
         }
         pw.println();
-        mDimLayerController.dump(prefix + "  ", pw);
+        mDimLayerController.dump(prefix, pw);
         pw.println();
-        mDividerControllerLocked.dump(prefix + "  ", pw);
+        mDividerControllerLocked.dump(prefix, pw);
         pw.println();
-        mPinnedStackControllerLocked.dump(prefix + "  ", pw);
+        mPinnedStackControllerLocked.dump(prefix, pw);
 
         if (mInputMethodAnimLayerAdjustment != 0) {
             pw.println(subPrefix