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

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

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