Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev

diff --cc packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
index e54b083,287819b..7042d22
--- 1/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
--- 2/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@@ -393,10 -389,10 +397,10 @@@ public class ScreenDecorations extends 
              mBoundingRect.setEmpty();
              mBoundingPath.reset();
              int newVisible;
-             if (hasCutout()) {
+             if (shouldDrawCutout(getContext()) && hasCutout()) {
                  mBounds.set(mInfo.displayCutout.getBounds());
                  localBounds(mBoundingRect);
 -                mInfo.displayCutout.getBounds().getBoundaryPath(mBoundingPath);
 +                updateBoundingPath();
                  invalidate();
                  newVisible = VISIBLE;
              } else {