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

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

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