Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: adc3f1ec2b" into nyc-mr1-dev-plus-aosp
am: f1b2350330
* commit 'f1b23503302767c2f548e797948cf632f1ffec34':
Change-Id: I30d4a288316eabb0c22c66ad85784b1306fdbf04
This commit is contained in: