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

am skip reason: subject contains skip directive

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

Change-Id: Ibc396c8147a0cad7212ab06047033082c5f79ea8