Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup...

Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: f6fdfb0d

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



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