Merge "Merge "Hyphenate text in CheckedTextView" into oc-dev am: 801fc5de50" into oc-dev-plus-aosp