Merge "Simplifying the drop animation code" into sc-v2-dev am: 0c299cb324 am: 6e342b0633

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

Change-Id: Ibc410108e42c0a0726e5fb337275bdad1c4df929