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

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

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



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