Merge "Merge "Apply theme shape clipping to group convo avatars" into rvc-dev...

Merge "Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690c am: bf52673a" into rvc-d1-dev-plus-aosp am: 6df7e9c4

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

Change-Id: I1aacceff850aa69884f872bb6fe59462efcbbf1c