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

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



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