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: 06537bd4 am: 02060663

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

Change-Id: Ib3601ad009fa110940ee9f044a60656e4a56dca0