[automerger skipped] Fix flash when setting photo as wallpaper am: 942f324cf5 -s ours

am skip reason: Merged-In I6709fc5ad304eb4caec5006c17094c71676e2e1d with SHA-1 2bfff84c7f is already in history

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

Change-Id: Idd195ed29fb82ce23937330e3dae234da3a24eb2