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

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

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



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