Merge "Fix cell size calculation in large screen devices" into sc-v2-dev am: 02d45252f3 am: ae72fc0587

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

Change-Id: I642226dc08a9f1a0695d45f5fd7d82f20008479c