Merge "If notifications can scroll at all, allow scroll up to status bar" into sc-dev am: 69e2f6a7de

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

Change-Id: I35b60a76a506330c877d2399eda189af5fad4f5a

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

@@ -2073,6 +2073,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
         int scrollRange = Math.max(0, contentHeight - mMaxLayoutHeight);
         int imeInset = getImeInset();
         scrollRange += Math.min(imeInset, Math.max(0, contentHeight - (getHeight() - imeInset)));
+        if (scrollRange > 0) {
+            scrollRange = Math.max(getScrollAmountToScrollBoundary(), scrollRange);
+        }
         return scrollRange;
     }