Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4

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



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