Merge mainline-release 6664920 to master - DO NOT MERGE am: 9e38564f2b

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

Change-Id: I6391d36b48e345f77d9663e6d90ee25aed598549