[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: fd8353c1
am: 2a1231fd -s ours
am skip reason: change_id Ie9984a95aa204710519da049819464875084900b with SHA1 d42e341c is in history
Change-Id: I820b168488bbfc7ccd0d989b5fd0d6e38a9740bd