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: e97c7fbf am: 5903f7c4" into rvc-qpr-dev-plus-aosp am: 5123bcc4

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

Change-Id: Ica4c486e68480b9d1f0ca5f009b4c31d29e629d4