[automerger skipped] Merge "Add timestamp and read status extras to MAP Client...
[automerger skipped] Merge "Add timestamp and read status extras to MAP Client message broadcasts" am: a1a846d3
am: 616dbe95 -s ours
am skip reason: change_id Ie9984a95aa204710519da049819464875084900b with SHA1 b3c5570d is in history
Change-Id: I820b168488bbfc7ccd0d989b5fd0d6e38a9740bd