Merge "Remove dependencies to LockscreenWallpaper" into udc-dev am: 7ff36def96 am: c7ed002aa7

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

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