[automerger skipped] Revert "[DO NOT MERGE]" am: 4eda9fc848 am: 0b934e9da4 -s ours

am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I1e5cc339eef904851aff67fcc16d96f3cbd0f76a