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

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

Change-Id: I1fb18dc69616876140b779b208ef2fb48a9a3d50