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

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

Change-Id: I5f03905462e81dbc1597e6b8465850911df08ccc