[automerger skipped] Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43 am: 5e9ff9eaa1 -s ours

am skip reason: Merged-In I363c98c23f84fe570ea9cb1a40128359f5b67c9f with SHA-1 46e368f755 is already in history

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

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