[automerger skipped] Merge "Fix adjacent task offset distance" into...

[automerger skipped] Merge "Fix adjacent task offset distance" into ub-launcher3-rvc-qpr-dev am: d3544435 am: 0861b7cd -s ours

am skip reason: Change-Id Ie3fffe0e5c304cb16e7637f058f5ce72cee40aeb with SHA-1 7383d4e6 is in history

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

Change-Id: Ic2ffe1cee8072cefee2c343d0fecfce0a1d3fb1a