Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into...
Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d am: 3f23dad9" into nyc-mr1-dev-plus-aosp
am: 39cc3f20
* commit '39cc3f20':
Change-Id: I032425a07bc2b1d8a31cdd6fd08737a7b435c153