Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43

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

Change-Id: I1eac374629b44772f25d59e40c0f91356205abe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>