Merge "Continue folding animation after it cancelled if necessary" into tm-dev am: 54c3d1b8

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



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