Merge "Snap to task from other grid row if dismissing non-snapped focused task and not enough tasks remain in current grid row to snap to." into sc-v2-dev am: 13e121e35a

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

Change-Id: I778473e10913718cbbf266c1d8335f8f31ae5d37