Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4

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

Change-Id: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9