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: ce90e803 am: dedaea4d am: 27a4d638

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

Change-Id: Ia6e24188adb45346b5f9e5830c49a8d43e950be8