Revert "Don't let UnderlineSpans affect text width"

This reverts commit 203ffaa103e796545701de30351d92787c1e3ce3.

Bug: 62234081
Change-Id: I8dd95dba52f268fb57f55e315431cedbc5128adc
2 files changed