[automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99 am:...

[automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99 am: 989e34f8 -s ours am: eee72258 -s ours am: c99a3ffa -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iefd9e4d5922065d7fec195f6f943c00c7d37bee4