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

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

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

Change-Id: I75d4cffbe410dc41309dbfbb8db772bbd3adacea