Merge "logd: don't coalesce identical log messages in the security buffer" am: 9d04b677e3 am: 13c39d7963

Change-Id: I11d2f9930ce8cb80c7e04a9dacd21bdfd53614a2