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

* commit '26a5c2dd740f309f3168790fc55a164738963835':
  Followon fix for 14276128 Clipping at bottom of TextView