Merge "Reland "use new clearWallpaperLocked method everywhere"" into udc-qpr-dev am: 5567ace79f

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

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