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