Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625 am: 67518dac am: 2f0e7869

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

Change-Id: I6fe4e5c5b85f21cbbe3ee380ce54cb98dd38062e