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

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

Change-Id: Ie813c78235957215bb502ba9b1d6cb076746ce22