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

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

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