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: 41ef23e5

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

Change-Id: I7385ecd1b562283fd2ee611e43604c6c5ef71a3f