Merge "launcher: use scalable grid in 4x4" into sc-v2-dev am: 5f8bbcd552

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

Change-Id: I7aae2cb0bad4fa85253b1004f1f3b0a91c2ff5ce