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

* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"