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

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

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

Change-Id: I3622d3052417195efe95062d392dc2591113d6d6