Merge "logd: don't coalesce identical log messages in the security buffer"