Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp
am: 4fa6801180
* commit '4fa68011809a199c1ac4e340640d65abea420253':
Change-Id: Ied804aced773e03bc02bdbac87fc84716d87c66d
This commit is contained in: