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

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



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