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: 2d710277

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



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