Merge "Lock screen ui clean up" into udc-dev am: 0d92b2ecf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/22572986

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