Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625 am: 26aa201d am: ecd91e5c

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

Change-Id: I303e83f4aef7cd06fb24604e48cbe86ad00ac975