Merge cherrypicks of [16840243] into sc-v2-release. am: 864b987d66

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

Change-Id: Ied0f29ea41251ff69e0702c3a67d48d0dcb6f62e