Merge "Add function of text hyphenate to buttons." into tm-dev am: a2a6d884 am: 19177be2

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



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