Merge "Fix inability to remove or interact with folder when removing 2nd item...

Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 80028976 am: 893c0fdd

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



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