Merge "Merge "Enable hyphenation on most of preference." into tm-dev am:...

Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e1 am: 7e712ef6" into tm-d1-dev-plus-aosp am: 2773af62

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



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