Merge "Don't go to NORMAL after task launches if animation in progress" into sc-dev am: 6db6c9fe7d

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

Change-Id: I7aaad17e2aa15a5126469858703189c5ef48fe87