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

* commit '990e26118d5b6cad2d34483b1908ba6f8334a764':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: Ia2c2d22b40c4613c54c9d86a29f21059da3f7a42