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

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

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