Merge "Update workspace, cell layout, shortcut and widget, and cell size...

Merge "Update workspace, cell layout, shortcut and widget, and cell size calculations." into tm-dev am: f4bd9b63

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



Change-Id: I146d34bcf0dd1ee4849d9a7c5aa441de883dec1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>