Merge "UI cleanup for Customization Lock screen" into udc-dev am: dbd1b8f275

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

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