Merge "Add launcher grid spec for tablet" into sc-v2-dev am: b1ae1ca124 am: 287d976c91

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

Change-Id: I609dbebde278dfb335a5a66c6bd71fcfa62a3102