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: 4c861665

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



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