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

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

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