[automerger skipped] Merge "Fix broken animation on two consecutive swipes."...

[automerger skipped] Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4 am: ff20854f am: a1936419 am: eca23d56 -s ours

am skip reason: Merged-In Ib969afb72cc15bd268613546f3495008b6bc9125 with SHA-1 f590efd6 is already in history

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



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