Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: cafa42b471
Change-Id: I44de7c62b4b20437e27c25b9875319790ccebec2
This commit is contained in:
c1f6891ef3
am: cafa42b471
Change-Id: I44de7c62b4b20437e27c25b9875319790ccebec2