Merge "Fix cropping by allowing layerType to be reset regardless of height." into sc-dev am: 466698f9af am: 330f2d4f2c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921771

Change-Id: I9a00808c00c16db83c5d0844e1238169a66a3ae1

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java

@@ -488,7 +488,8 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable {
 
     @Override
     public void setLayerType(int layerType, Paint paint) {
-        if (hasOverlappingRendering()) {
+        // Allow resetting the layerType to NONE regardless of overlappingRendering
+        if (layerType == LAYER_TYPE_NONE || hasOverlappingRendering()) {
             super.setLayerType(layerType, paint);
         }
     }