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

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c