Merge "Changing InflatedMessage to use RelativeLayout instead of LinearLayout." into arc-apps
am: 308c030c90

Change-Id: I6b0430bbebe60c822bf9928f46b94765b5325462