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

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

Change-Id: I4ad204fa0e3c3557f439905c20064c5ee9afa957