Merge cherrypicks of ['googleplex-android-review.googlesource.com/23816690'] into udc-release. am: da13b3d410

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

Change-Id: I6bc3217ace56a8a43498650506798fe358d75e7d
Signed-off-by: Automerger Merge Worker <[email protected]>