Merge "Fix incorrect SetupChooseLockPattern layout" into tm-qpr-dev am: 483c9b72 am: 008f70c2

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



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