Merge "Making tablet grid scalable and tuning size" into tm-dev am: b9879a0b85 am: ce98770080

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

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