Merge changes from topic "consistencyjpo" into sc-dev am: c1512ce4fd

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

Change-Id: I716ebe27dd2522d73f30befd34c510793b322cf1