Merge "Use falllback animation when going back to no icon" into sc-v2-dev am: 1ad55e6ab5

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

Change-Id: Iad0f08f8e788093a48ff85bfa42da1338573c018