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

Change-Id: I566523005ac5f21e1033f30d99d220b8f513167c