Merge "DO NOT MERGE: Fix temporary black after setting a new image wallpaper" into sc-qpr1-dev am: a3921a91f4

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

Change-Id: I27a045c5502ece4e80afe21bffdd8821bd16baee