Merge "Fix NPE where CellLayout is null when removing item out of folder" into udc-dev am: 5d81dd2d77 am: d0642ee589

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

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