Merge "Handling group chat sender" into sc-dev am: bf0507b001

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

Change-Id: I33178c116c51995fad695dcb847cc814cced3684