[automerge] Revert "Making tablet grid scalable and tuning size" 2p: 4ea95b7fd8

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

Change-Id: I7409f175e98728b3f8c94912c55fc8f9e1665c46