am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev

* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView