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

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

Change-Id: Ib057e0d174e5629c7e47c881e4e55dd8483fd7b7