Merge "Fix exception happened in maybeSetUpImageGrid()" into sc-dev am: 77aa9969ad

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

Change-Id: I2cf88bc56a8bd9733696d950e933d4157d086f49