Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21

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

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