Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am:...

Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb8 am: daa90035

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



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