Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev

diff --combined services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
index 4da9c06,8279b51..6d5673e
--- 1/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
--- 2/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
+++ b/services/core/java/com/android/server/wm/WindowManagerDebugConfig.java
@@@ -52,7 -52,7 +52,7 @@@ public class WindowManagerDebugConfig 
      static final boolean DEBUG_CONFIGURATION = false;
      static final boolean DEBUG_APP_TRANSITIONS = false;
      static final boolean DEBUG_STARTING_WINDOW_VERBOSE = false;
 -    static final boolean DEBUG_STARTING_WINDOW = DEBUG_STARTING_WINDOW_VERBOSE || true;
 +    static final boolean DEBUG_STARTING_WINDOW = DEBUG_STARTING_WINDOW_VERBOSE || false;
      static final boolean DEBUG_WALLPAPER = false;
      static final boolean DEBUG_WALLPAPER_LIGHT = false || DEBUG_WALLPAPER;
      static final boolean DEBUG_DRAG = false;
@@@ -77,5 -77,5 +77,5 @@@
      static final boolean DEBUG_UNKNOWN_APP_VISIBILITY = false;
  
      static final String TAG_KEEP_SCREEN_ON = "DebugKeepScreenOn";
-     static final boolean DEBUG_KEEP_SCREEN_ON = true;
+     static final boolean DEBUG_KEEP_SCREEN_ON = false;
  }