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: 0e6a737e am: 9df24d41

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

Change-Id: Ie1f6bdaf43f49f3c16bf378609fa1309b01b3af5