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