Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7

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

Change-Id: I7ed98b733806f81cf388a7a37f252a0e31c25ae0