Merge "Fix window cropping issue."

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

diff --cc services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
index 503e1ac,398cf05..fdcf57b
--- 1/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
--- 2/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java
@@@ -21,8 -21,9 +21,9 @@@ import org.junit.Test
  import org.junit.runner.RunWith;
  
  import android.app.ActivityManager.TaskDescription;
 -import android.content.Context;
 +import android.content.res.Configuration;
  import android.graphics.Rect;
+ import android.os.Debug;
  import android.platform.test.annotations.Presubmit;
  import android.support.test.InstrumentationRegistry;
  import android.support.test.filters.SmallTest;