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

Change-Id: Ib423ae61f2297af574f553c9e8f7bb18395c45d2