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>

src/com/android/launcher3/folder/LauncherDelegate.java

@@ -94,6 +94,9 @@ public class LauncherDelegate {
                         // folder
                         CellLayout cellLayout = mLauncher.getCellLayout(info.container,
                                 info.screenId);
+                        if (cellLayout == null) {
+                            return;
+                        }
                         finalItem =  info.contents.remove(0);
                         newIcon = mLauncher.createShortcut(cellLayout, finalItem);
                         mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,