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: Ib69063fb66355e530c92806b078bcae10b0ba754