Merge "Correct the computation of the cell size." into sc-v2-dev am: bdddc5ab0c am: ab571d1ed0

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

Change-Id: I38ef570fe358e3bbccc3d3012829d1d955722f09