DO NOT MERGE: Fix temporary black after setting a new image wallpaper am: 7af300eea6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15639322

Change-Id: I1e49bd3cc098339d2d51744dae1816fcc42fe88e