Merge "Groups which had a priority conversation promoted out of them do not...

Merge "Groups which had a priority conversation promoted out of them do not show that conversation's avatar." into tm-dev am: 220902fc am: ffd5a54c am: af6d38ce

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



Change-Id: Ib7ffd7d1f98d155f7db070c82c2ffa17dc8076bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>