[conflict] Merge "Fix inability to remove or interact with folder when...

[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 80028976 am: 96e03b3e

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


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