Merge "logd: record multiple duplicate messages as chatty" am: d0ee73932f
am: ad3f07d25e

Change-Id: I7c0545dafa85ac4974179098c58cd16ec0de4a06