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: e0189ba3

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



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