[automerger skipped] Merge "Reland "use new clearWallpaperLocked method...

[automerger skipped] Merge "Reland "use new clearWallpaperLocked method everywhere"" into udc-qpr-dev am: 5567ace7 am: d8ac1c61 -s ours

am skip reason: Merged-In Iba71f250b59b08814033eb9364613c96b15ea966 with SHA-1 1e68053f is already in history

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



Change-Id: I55d0ee2c9a2be7f252edb2314a6e1f6b3b5b4292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>