Merge "If notifications can scroll at all, allow scroll up to status bar" into...

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

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

Change-Id: I660dbdc1451e9ad1df26fd7946f75663f2559c4c