Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690c

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

Change-Id: I88a41dc54c3c793471ef9f58c17967a8c01096b8