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

Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 3aa0a120 am: c6827326" into tm-d1-dev-plus-aosp am: 777b3194

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17526304



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