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

[automerger skipped] Merge "DO NOT MERGE: Fix temporary black after setting a new image wallpaper" into sc-qpr1-dev am: a3921a91 am: 4822e4d0 -s ours am: 220cf13b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6b981065c45f48fb32647b3e9c5320cc0f6bd8a6