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

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



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