This reverts commit a3420c7f. Reason for revert: causes text density inflation issue Bug: 131914931 Change-Id: Ic63ba977dba9df6e327b18e51661d4eea6105d53