Merge "Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c" into tm-d1-dev-plus-aosp am: 52c3d5bc44 am: e6ea1e2374

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

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