Merge "Revert fixing the style of Choose screen lock wasn’t consistent in...

Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132a am: 624ebae3

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



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