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

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



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