[automerger skipped] Reparent folders and app pairs am: 00bf2488d1 -s ours

am skip reason: Merged-In Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22 with SHA-1 742630c2f8 is already in history

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

Change-Id: I01289e9c26c1599cab5ac6ecb6bba2d5bb55e9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>