am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev

* commit '243e551ac380f86639eee3e95a482d8e17836670':
  Followon fix for 14276128 Clipping at bottom of TextView