Merge "Fix CellLayout cast exception when drag is canceled" into sc-dev am: 76f5572648

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

Change-Id: I8d814a3459ff208c38e2eae6b2cfc6fb88def043