[automerger skipped] Merge "Fix animation problem when swipeing up app to...

[automerger skipped] Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-qpr1-dev am: d688120e am: 495721aa -s ours

am skip reason: skipped by user alexchau

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15640810

Change-Id: I5ddc8a9b4ef33d7badcd0ecc142d8c6a7f1b65d5