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

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

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