Merge "Merge "Increase avatar and sender name sizes in MessagingStyle" into...
Merge "Merge "Increase avatar and sender name sizes in MessagingStyle" into rvc-dev am: 7b27da1d am: a435b2be" into rvc-d1-dev-plus-aosp am: 5601452b
Change-Id: I3e002620e125afd88587363031a0d78b3aab540c