Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a am: a6e093c5c1

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

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