Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev

services/core/java/com/android/server/wm/CircularDisplayMask.java

@@ -56,7 +56,7 @@ class CircularDisplayMask {
             int screenOffset, int maskThickness) {
         mScreenSize = new Point();
         display.getSize(mScreenSize);
-        if (mScreenSize.x != mScreenSize.y) {
+        if (mScreenSize.x != mScreenSize.y + screenOffset) {
             Slog.w(TAG, "Screen dimensions of displayId = " + display.getDisplayId() +
                     "are not equal, circularMask will not be drawn.");
             mDimensionsUnequal = true;