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

Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b3

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



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