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

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



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