Merge "Reset internal and visual swipe state whenever the shade collapses." into udc-dev am: b91f5bac am: 2d710277 am: 03fceafd

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



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