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 am: efd7b856

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

Change-Id: Ib65dc82d33fed40b22a9bf1eb2e47174b88c03ec