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

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

Change-Id: Ifc010c638932588e593304d56e25ce4fa62a8107