Merge "Re-land "Update workspace, cell layout, shortcut and widget, and cell...

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

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



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