Merge "Manage education title and description are two lines and ellipsized"...

Merge "Manage education title and description are two lines and ellipsized" into rvc-dev am: df38e692 am: 2cfedf4f am: 6e15084b am: 6a144a29

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

Change-Id: If44873307ce2b34f1e3e9c3eef2c89207e98065d