Restore shelf clip logic from R to prevent clipping on collapse.

Fixes: 187653275
Test: Expand/collapse shade/notification with/without shelf
Change-Id: I03024c6a3adfb40f1d585f4bac2644aec9050261

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

@@ -259,11 +259,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
             final float inShelfAmount = updateShelfTransformation(i, child, scrollingFast,
                     expandingAnimated, isLastChild);
 
-            final float stackEnd = mAmbientState.getStackY()
-                    + mAmbientState.getStackHeight();
             // TODO(b/172289889) scale mPaddingBetweenElements with expansion amount
             if ((isLastChild && !child.isInShelf()) || aboveShelf || backgroundForceHidden) {
-                notificationClipEnd = stackEnd;
+                notificationClipEnd = shelfStart + getIntrinsicHeight();
             } else {
                 notificationClipEnd = shelfStart - mPaddingBetweenElements;
             }