Merge "Reset internal and visual swipe state whenever the shade collapses."...

Merge "Reset internal and visual swipe state whenever the shade collapses." into udc-dev am: b91f5bac am: 58f27dde am: 4edd48eb

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



Change-Id: Ic05a0a5f7716f978047db8da6905b5dc48234629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>