Merge "Fix convo name / icon overlap on low DPI" into rvc-dev am: 501c451d am: 8fb6c5af am: 47b07b7c

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

Change-Id: I7f127ad337eda2047a4b3cab3551a014f130811b