Merge "Making tablet grid scalable and tuning size" into tm-dev am: 1e583dfa0e

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

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