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: 21cbd8ea am: ef72e0d9

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

Change-Id: Iee917b4f4c2567fba8ae90faa1609ab843bc147f