Merge "Revert "use new clearWallpaperLocked method everywhere"" into udc-qpr-dev am: 41b1f988

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



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