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 am: c40eae2f

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

Change-Id: Ida60784c1f558df1613978d5a1321a748caf4c9b