[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: 6c740e93 -s ours am: e0d233e6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib1383311484ca9a7d148f8e18e9d837da329e0ad