Merge "Fix convo name / icon overlap on low DPI" into rvc-dev am: 501c451d7a am: 228e6db9f8 am: 3249f4259e am: d88a4098fb

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

Change-Id: I4e6537d4b3a35e388cad5eb33835096ee653e47c