Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am:...

Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78 am: c2989e34 am: 1ff1e7a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885867

Change-Id: Ie932ae213afc0e232b013f75f3561b253b5347bf