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

Change-Id: I617ef804eee95fee7011059ed0282e8eb2d00ad4