[automerger skipped] Revert "[DO NOT MERGE]" am: 4eda9fc848 am: 0b934e9da4 -s ours am: 3e5b8d82e9 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1788551 Change-Id: I736bc1acceca5aa4142a8b654fbff03300577ef0
This commit is contained in: