[automerger skipped] Merge ab/6749736 in stage. am: 66edcd5761 -s ours am: cdb172a777 -s ours

am skip reason: Change-Id I02e0a07805d23b955069fad93b61b4476e5e364e with SHA-1 7a182a17e9 is in history

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

Change-Id: Iee74df282d53f9522e2290c15daff739376ad3f8