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

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



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