Merge "[AllApps] NORMAL <-> ALL_APPS motion clean fixes for AOSP" into sc-v2-dev am: 0f4e4856a2

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

Change-Id: I9362d09b6a65d09e7e39a5f9ca3cbc4b2673d29c