Merge "Fix collapsed group message text alignment" into rvc-dev am: 728da700 am: eb432a83 am: a061082d

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

Change-Id: I09830744fbb92e0ac3aeda6c8440d8684006bf8f