[automerger skipped] DO NOT MERGE: Fix temporary black after setting a new...

[automerger skipped] DO NOT MERGE: Fix temporary black after setting a new image wallpaper am: 7af300ee am: 3f6e8344 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I26c71200f20bd5b6cd8ec31f703ec3cc4cb09aab