Merge "Fix missing icon for one-to-one convos" into rvc-dev am: 05e10b59 am: ce90e803

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

Change-Id: Ic3f5aba0428e22e1124b2f7f1cc76b803e7202dd