Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 4dc77b7a5e
am: 4e96f6de03

* commit '4e96f6de033cfc6d14398e321f783583d1881382':

Change-Id: I9b405db1b30fbdbf6d84af16d48c5e439cb5ac28