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

Merge "Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78 am: c2989e34 am: 41ef23e5" into rvc-qpr-dev-plus-aosp am: 20d49e03

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

Change-Id: I666414c5a266a6ef76be555667af7773b55e14b1