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: I0b3e1411b52a3705469ec7a9f38460416fb45ddc