Merge "Restore 1:1 relationship between swipe and shade expansion" into sc-dev...

Merge "Restore 1:1 relationship between swipe and shade expansion" into sc-dev am: 7043460f am: 2c138981

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

Change-Id: Ie32b261232018aa5a2be51769d5a938897147656