am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at...
am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '69a9d925':
Revert "Followon fix for 14276128 Clipping at bottom of TextView"