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

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

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



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