[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 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4f06fc5ad6dc32c673c11df47d912c7afac7bcdf