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

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

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

Change-Id: I349486fe5d90f7a5a4f87a72d13dad62009c47f3