Merge "Fixed bug with turnScreenOn window flag."

diff --cc services/core/java/com/android/server/wm/RootWindowContainer.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowState.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowStateAnimator.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
Simple merge