DO NOT MERGE - Merge ab/7272582 am: 102b1e860f

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

Change-Id: I6542348de438e8476f1a2ec3fc22b19dfd54fe5c