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

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



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