Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1

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



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