Merge "The fallback number of columns in the grid should be 1 instead of 0." into ub-launcher3-master am: 5678780fac am: fa8f212cdd

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

Change-Id: I81361015f1ec1d5f20cec4a5f1b3fd68bb09045e