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

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

Change-Id: Ie0b5b18a58bfe24c38e97ed52758abc4edd4d572