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 am: ea25f8f6e0

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

Change-Id: I9ad7a3a19ed7766753f7cb30714cbb2e81bc69a8