resolved conflicts for merge of 1d67698b to master

Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
index 7c283ed,c7406bf..99bad07
--- 1/services/core/java/com/android/server/wm/WindowManagerService.java
--- 2/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@@ -10585,9 -10730,8 +10588,9 @@@ public class WindowManagerService exten
              return;
          }
  
 -        if (mWaitingForConfig || mAppsFreezingScreen > 0 || mWindowsFreezingScreen
 +        if (mWaitingForConfig || mAppsFreezingScreen > 0
 +                || mWindowsFreezingScreen == WINDOWS_FREEZING_SCREENS_ACTIVE
-                 || mClientFreezingScreen) {
+                 || mClientFreezingScreen || !mOpeningApps.isEmpty()) {
              if (DEBUG_ORIENTATION) Slog.d(TAG,
                  "stopFreezingDisplayLocked: Returning mWaitingForConfig=" + mWaitingForConfig
                  + ", mAppsFreezingScreen=" + mAppsFreezingScreen