Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa

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

Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4