Merge "logd: multiple identical do not report expired" am: f0cccf4565 am: 9627217f4c
am: b8accd1108

Change-Id: I020f847fe26a85582263bb22a9af9a5fb9a682ad