Merge "Fix jump in animation for hotseat while re-arranging icons" into tm-dev...

Merge "Fix jump in animation for hotseat while re-arranging icons" into tm-dev am: 49cb99a4 am: 185ceecb

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

Change-Id: I20e9cb72c2addc35362502bc3efdb9981fbc8127