Merge "Fix temporary black wallpaper after setting a new image wallpaper" into sc-v2-dev am: 14dbc9facc

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

Change-Id: Ia2eec16346b7cf15ed51e80a61b47f7031be27ba