Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev
am: ae5d4ff831

Change-Id: Ib76e1da3dbd8b55ff55b3df2f040380e86fd3c35